diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-06 17:31:22 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-06 17:31:22 +0200 |
| commit | 36c2b9ca78db91d4e9781c33b2db754263fe76fa (patch) | |
| tree | 18109983a37bc675202712ae9785fd6040bfd418 /mysql-test/t/union.test | |
| parent | 840e853e000c8296815e0c7b2b8112f4e42ed973 (diff) | |
| parent | 236015ed7ac81e3a4525e04a7769cf503af38e14 (diff) | |
| download | mariadb-git-36c2b9ca78db91d4e9781c33b2db754263fe76fa.tar.gz | |
merge fixes
sql/item_subselect.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/union.test')
| -rw-r--r-- | mysql-test/t/union.test | 1 |
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 |