Commit 3cd4b7a9 authored by unknown's avatar unknown
Browse files

Fix tests after merge 


mysql-test/r/create.result:
  Update result
mysql-test/r/type_ranges.result:
  Update result
mysql-test/t/archive.test:
  Rewrite path for embedded server testing
parent 474a4d5d

mysql-test/r/create.result

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ explain t2; 
Field	Type	Null	Key	Default	Extra

a	int(11)	YES		NULL	

b	bigint(11)	NO		0	

c	bigint(10)	NO		0	

c	bigint(11)	NO		0	

d	date	YES		NULL	

e	varchar(1)	NO			

f	datetime	YES		NULL

mysql-test/r/type_ranges.result

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ drop table t2; 
create table t2 (primary key (auto)) select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;

show full columns from t2;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

auto	int(6) unsigned	NULL	NO	PRI	0		#	

auto	bigint(12) unsigned	NULL	NO	PRI	0		#	

t1	bigint(1)	NULL	NO		0		#	

t2	varchar(1)	latin1_swedish_ci	NO				#	

t3	varchar(256)	latin1_swedish_ci	NO				#

mysql-test/t/archive.test

+2 −0
Original line number Diff line number Diff line
@@ -1296,6 +1296,8 @@ select fld1,fld3 from t2 where fld1 like "25050_"; 
create table t3 engine=archive select * from t2;

select * from t3 where fld3='bonfire';

select count(*) from t3;

# Clean up path in error message

--replace_result $MYSQL_TEST_DIR . /var/master-data/ /

rename table t3 to t4;

select * from t4 where fld3='bonfire';

select count(*) from t4;