Commit 5e9324a8 authored by unknown's avatar unknown
Browse files

Fix merge problems; work around disparate "ls" behaviors. 


mysql-test/r/ctype_recoding.result:
  Case change in 5.1.
mysql-test/t/heap_btree.test:
  Fixes bad merge.
mysql-test/t/partition.test:
  Split terrible "ls" test into two parts so that the different sorting orders
  of sundry OSes don't affect the output.
parent ff825de6

mysql-test/r/ctype_recoding.result

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ create table t1(a char character set cp1251 default _koi8r 0xFF); 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` char(1) character set cp1251 default ''

  `a` char(1) CHARACTER SET cp1251 DEFAULT ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1(a char character set latin1 default _cp1251 0xFF);

mysql-test/t/heap_btree.test

+0 −12
Original line number Diff line number Diff line
@@ -204,16 +204,4 @@ CREATE TABLE t1 (a INT, UNIQUE USING BTREE(a)) ENGINE=MEMORY; 
INSERT INTO t1 VALUES(NULL),(NULL);

DROP TABLE t1;



select a from t1 where a > 2;

delete from t1 where a < 4;

select a from t1 order by a;

insert into t1 values (2), (2), (2), (1), (1), (3), (3), (3), (3);

select a from t1 where a > 4;

delete from t1 where a > 4;

select a from t1 order by a;

select a from t1 where a > 3;

delete from t1 where a >= 2;

select a from t1 order by a;

drop table t1;



--echo End of 5.0 tests

mysql-test/t/partition.test

+10 −6
Original line number Diff line number Diff line
@@ -1340,11 +1340,13 @@ subpartition by hash (a) 
 (SUBPARTITION subpart00, SUBPARTITION subpart01));



--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/test/t1* || true

--exec ls $MYSQLTEST_VARDIR/master-data/test/t1.* || true

--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/tmpdata/t1* || true

--exec ls $MYSQLTEST_VARDIR/master-data/test/t1#* || true

--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/tmpinx/t1* || true

--exec ls $MYSQLTEST_VARDIR/master-data/tmpdata/t1#* || true

--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/tmpinx/t1#* || true

--replace_result $MYSQLTEST_VARDIR "hello"



eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
@@ -1354,11 +1356,13 @@ eval ALTER TABLE t1 REORGANIZE PARTITION p0 INTO 
 (SUBPARTITION subpart20, SUBPARTITION subpart21));



--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/test/t1* || true

--exec ls $MYSQLTEST_VARDIR/master-data/test/t1.* || true

--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/test/t1#* || true

--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/tmpdata/t1* || true

--exec ls $MYSQLTEST_VARDIR/master-data/tmpdata/t1#* || true

--replace_result $MYSQLTEST_VARDIR "hello"

--exec ls $MYSQLTEST_VARDIR/master-data/tmpinx/t1* || true

--exec ls $MYSQLTEST_VARDIR/master-data/tmpinx/t1#* || true



drop table t1;

--exec rmdir $MYSQLTEST_VARDIR/master-data/tmpdata || true