Commit a8afc137 authored by unknown's avatar unknown
Browse files

After merge fixes 


mysql-test/r/order_by.result:
  After merge fix
mysql-test/t/symlink.test:
  Comments
parent 7aecbab8

mysql-test/r/order_by.result

+0 −38
Original line number Diff line number Diff line
@@ -778,41 +778,3 @@ sid wnid 
39560	01019090000

37994	01019090000

drop table t1;
 
create table t1 (

`sid` decimal(8,0) default null,

`wnid` varchar(11) not null default '',

key `wnid14` (`wnid`(4)),

key `wnid` (`wnid`)

) engine=myisam default charset=latin1;

insert into t1 (`sid`, `wnid`) values

('10100','01019000000'),('37986','01019000000'),('37987','01019010000'),

('39560','01019090000'),('37989','01019000000'),('37990','01019011000'),

('37991','01019011000'),('37992','01019019000'),('37993','01019030000'),

('37994','01019090000'),('475','02070000000'),('25253','02071100000'),

('25255','02071100000'),('25256','02071110000'),('25258','02071130000'),

('25259','02071190000'),('25260','02071200000'),('25261','02071210000'),

('25262','02071290000'),('25263','02071300000'),('25264','02071310000'),

('25265','02071310000'),('25266','02071320000'),('25267','02071320000'),

('25269','02071330000'),('25270','02071340000'),('25271','02071350000'),

('25272','02071360000'),('25273','02071370000'),('25281','02071391000'),

('25282','02071391000'),('25283','02071399000'),('25284','02071400000'),

('25285','02071410000'),('25286','02071410000'),('25287','02071420000'),

('25288','02071420000'),('25291','02071430000'),('25290','02071440000'),

('25292','02071450000'),('25293','02071460000'),('25294','02071470000'),

('25295','02071491000'),('25296','02071491000'),('25297','02071499000');

explain select * from t1 where wnid like '0101%' order by wnid;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	wnid14,wnid	wnid	11	NULL	10	Using where

select * from t1 where wnid like '0101%' order by wnid;

sid	wnid

10100	01019000000

37986	01019000000

37989	01019000000

37987	01019010000

37990	01019011000

37991	01019011000

37992	01019019000

37993	01019030000

39560	01019090000

37994	01019090000

drop table t1;

mysql-test/t/symlink.test

+8 −2
Original line number Diff line number Diff line
@@ -49,8 +49,9 @@ check table t9; 
optimize table t9;

repair table t9;

alter table t9 add column c int not null;

--replace_result $MYSQL_TEST_DIR TEST_DIR

show create table t9;



#--replace_result $MYSQL_TEST_DIR TEST_DIR

#show create table t9;



# Test renames

alter table t9 rename t8, add column d int not null;
@@ -64,6 +65,9 @@ drop table t1; 
# Note that we are using the above table t9 here!

#



--replace_result $MYSQL_TEST_DIR TEST_DIR

SHOW CREATE TABLE t9;



disable_query_log;

--error 1103,1103

create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="tmp";
@@ -78,9 +82,11 @@ create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, p 
--error 1103,1103

create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path";



# Should fail becasue the file t9.MYI already exist in 'run'

--error 1,1

eval create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="$MYSQL_TEST_DIR/var/run";



# Should fail becasue the file t9.MYD already exist in 'tmp'

--error 1,1

eval create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="$MYSQL_TEST_DIR/var/tmp";

enable_query_log;