diff options
author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-06 14:23:39 -0400 |
---|---|---|
committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-06 14:23:39 -0400 |
commit | 5e9324a838ca37865c8ebec3e4db9cdfa7c205ee (patch) | |
tree | 9b0c69feceabf184653714d210c2a7841aa59a62 /mysql-test/t/heap_btree.test | |
parent | ff825de649ff29edc2effb412eed84e1e54de77c (diff) | |
download | mariadb-git-5e9324a838ca37865c8ebec3e4db9cdfa7c205ee.tar.gz |
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.
Diffstat (limited to 'mysql-test/t/heap_btree.test')
-rw-r--r-- | mysql-test/t/heap_btree.test | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/mysql-test/t/heap_btree.test b/mysql-test/t/heap_btree.test index 12c911aa9c9..03ba8661a3c 100644 --- a/mysql-test/t/heap_btree.test +++ b/mysql-test/t/heap_btree.test @@ -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 |