From 8f4a153320361b02c391622e451bd7ea7e733cef Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Dec 2000 08:24:18 -0700 Subject: mrg000001.dummy.result Rename: mysql-test/r/3.23/mrg000001.dummy.result -> mysql-test/r/mrg000001.dummy.result mrg000001.result Rename: mysql-test/r/3.23/mrg000001.result -> mysql-test/r/mrg000001.result mrg000001.test Rename: mysql-test/t/3.23/mrg000001.test -> mysql-test/t/mrg000001.test mysql-test/t/mrg000001.test: Rename: mysql-test/t/3.23/mrg000001.test -> mysql-test/t/mrg000001.test mysql-test/r/mrg000001.dummy.result: Rename: mysql-test/r/3.23/mrg000001.dummy.result -> mysql-test/r/mrg000001.dummy.result mysql-test/r/mrg000001.result: Rename: mysql-test/r/3.23/mrg000001.result -> mysql-test/r/mrg000001.result --- mysql-test/r/3.23/mrg000001.dummy.result | 1 - mysql-test/r/3.23/mrg000001.result | 5 ----- mysql-test/r/mrg000001.dummy.result | 1 + mysql-test/r/mrg000001.result | 5 +++++ mysql-test/t/3.23/mrg000001.test | 17 ----------------- mysql-test/t/mrg000001.test | 17 +++++++++++++++++ 6 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 mysql-test/r/3.23/mrg000001.dummy.result delete mode 100644 mysql-test/r/3.23/mrg000001.result create mode 100644 mysql-test/r/mrg000001.dummy.result create mode 100644 mysql-test/r/mrg000001.result delete mode 100644 mysql-test/t/3.23/mrg000001.test create mode 100644 mysql-test/t/mrg000001.test (limited to 'mysql-test') diff --git a/mysql-test/r/3.23/mrg000001.dummy.result b/mysql-test/r/3.23/mrg000001.dummy.result deleted file mode 100644 index 767f92bc2cb..00000000000 --- a/mysql-test/r/3.23/mrg000001.dummy.result +++ /dev/null @@ -1 +0,0 @@ -incr othr diff --git a/mysql-test/r/3.23/mrg000001.result b/mysql-test/r/3.23/mrg000001.result deleted file mode 100644 index 8b351ebe780..00000000000 --- a/mysql-test/r/3.23/mrg000001.result +++ /dev/null @@ -1,5 +0,0 @@ -incr othr -1 10 -2 24 -4 33 -3 53 diff --git a/mysql-test/r/mrg000001.dummy.result b/mysql-test/r/mrg000001.dummy.result new file mode 100644 index 00000000000..767f92bc2cb --- /dev/null +++ b/mysql-test/r/mrg000001.dummy.result @@ -0,0 +1 @@ +incr othr diff --git a/mysql-test/r/mrg000001.result b/mysql-test/r/mrg000001.result new file mode 100644 index 00000000000..8b351ebe780 --- /dev/null +++ b/mysql-test/r/mrg000001.result @@ -0,0 +1,5 @@ +incr othr +1 10 +2 24 +4 33 +3 53 diff --git a/mysql-test/t/3.23/mrg000001.test b/mysql-test/t/3.23/mrg000001.test deleted file mode 100644 index ded3ecc8898..00000000000 --- a/mysql-test/t/3.23/mrg000001.test +++ /dev/null @@ -1,17 +0,0 @@ -DROP TABLE IF EXISTS test1; -DROP TABLE IF EXISTS test2; -DROP TABLE IF EXISTS test3; - -CREATE TABLE test1 (incr int not null, othr int not null, primary key(incr)); -CREATE TABLE test2 (incr int not null, othr int not null, primary key(incr)); -CREATE TABLE test3 (incr int not null, othr int not null, primary key(incr)) -TYPE=MERGE UNION=(test1,test2); - -@r/3.23/mrg000001.dummy.result SELECT * from test3; - -INSERT INTO test1 VALUES ( 1,10),( 3,53),( 5,21),( 7,12),( 9,17); -INSERT INTO test2 VALUES ( 2,24),( 4,33),( 6,41),( 8,26),( 0,32); -INSERT INTO test1 VALUES (11,20),(13,43),(15,11),(17,22),(19,37); -INSERT INTO test2 VALUES (12,25),(14,31),(16,42),(18,27),(10,30); - -@r/3.23/mrg000001.result SELECT * from test3 where incr in (1,2,3,4) order by othr; diff --git a/mysql-test/t/mrg000001.test b/mysql-test/t/mrg000001.test new file mode 100644 index 00000000000..ded3ecc8898 --- /dev/null +++ b/mysql-test/t/mrg000001.test @@ -0,0 +1,17 @@ +DROP TABLE IF EXISTS test1; +DROP TABLE IF EXISTS test2; +DROP TABLE IF EXISTS test3; + +CREATE TABLE test1 (incr int not null, othr int not null, primary key(incr)); +CREATE TABLE test2 (incr int not null, othr int not null, primary key(incr)); +CREATE TABLE test3 (incr int not null, othr int not null, primary key(incr)) +TYPE=MERGE UNION=(test1,test2); + +@r/3.23/mrg000001.dummy.result SELECT * from test3; + +INSERT INTO test1 VALUES ( 1,10),( 3,53),( 5,21),( 7,12),( 9,17); +INSERT INTO test2 VALUES ( 2,24),( 4,33),( 6,41),( 8,26),( 0,32); +INSERT INTO test1 VALUES (11,20),(13,43),(15,11),(17,22),(19,37); +INSERT INTO test2 VALUES (12,25),(14,31),(16,42),(18,27),(10,30); + +@r/3.23/mrg000001.result SELECT * from test3 where incr in (1,2,3,4) order by othr; -- cgit v1.2.1