summaryrefslogtreecommitdiff
path: root/mysql-test/t/union.test
diff options
context:
space:
mode:
authorSinisa@sinisa.nasamreza.org <>2003-03-06 17:31:22 +0200
committerSinisa@sinisa.nasamreza.org <>2003-03-06 17:31:22 +0200
commit57ed8b11fdf7710d3c63bc532f43e937a7f948f2 (patch)
tree18109983a37bc675202712ae9785fd6040bfd418 /mysql-test/t/union.test
parent411ed6be0a943d7d45da4e3ff9152f5047af3f6f (diff)
parentffa8a47b6d1bf1abeeacdd2e8e8543934536baf1 (diff)
downloadmariadb-git-57ed8b11fdf7710d3c63bc532f43e937a7f948f2.tar.gz
merge fixes
Diffstat (limited to 'mysql-test/t/union.test')
-rw-r--r--mysql-test/t/union.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index b73d9b5fdfc..74d04f7e2ce 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -124,6 +124,7 @@ INSERT INTO t2 (id, id_master, text1, text2) VALUES("4", "1",
SELECT 1 AS id_master, 1 AS id, NULL AS text1, 'ABCDE' AS text2 UNION SELECT id_master, t2.id, text1, text2 FROM t1 LEFT JOIN t2 ON t1.id = t2.id_master;
SELECT 1 AS id_master, 1 AS id, 'ABCDE' AS text1, 'ABCDE' AS text2 UNION SELECT id_master, t2.id, text1, text2 FROM t1 LEFT JOIN t2 ON t1.id = t2.id_master;
drop table if exists t1,t2;
+(SELECT 1,3) UNION (SELECT 2,1) ORDER BY (SELECT 2);
#
# Test of bug when using the same table multiple times