diff options
| author | serg@serg.mylan <> | 2004-03-04 14:48:28 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-03-04 14:48:28 +0100 |
| commit | f8345cc6171edd0cbe78900975b16ed8d77f67d3 (patch) | |
| tree | 010bf275730e5b27e4e3554290d0f62f8d54c326 /mysql-test | |
| parent | 995b74ee0db22aeacbfe8f4d19cef94b2fa4000d (diff) | |
| parent | c4b55a2aeac630a70013f310577b890ba17fb037 (diff) | |
| download | mariadb-git-f8345cc6171edd0cbe78900975b16ed8d77f67d3.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/merge.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/merge.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 650fdb1c77b..7b2b9a47b0f 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -560,7 +560,7 @@ select * from t6; a 1 2 -drop table if exists t1, t2, t3, t4, t5, t6; +drop table if exists t6, t5, t4, t3, t2, t1; DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1 ( fileset_id tinyint(3) unsigned NOT NULL default '0', diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index b625e780f1f..76382a9cd99 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -202,7 +202,7 @@ insert into t4 values (1); insert into t5 values (2); create temporary table t6 (a int not null) TYPE=MERGE UNION=(t4,t5); select * from t6; -drop table if exists t1, t2, t3, t4, t5, t6; +drop table if exists t6, t5, t4, t3, t2, t1; # # testing merge::records_in_range and optimizer |