summaryrefslogtreecommitdiff
path: root/mysql-test/r/union.result
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2001-10-25 14:41:49 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2001-10-25 14:41:49 +0300
commit1c908336061adcc88705c0e8f99ac849bb31b1d6 (patch)
tree8fa4e9dfeef51e31e2d6a03e2ba79a26d832f7c5 /mysql-test/r/union.result
parentf9b331ff8a647dbb689061ec1cc0a03d73b53446 (diff)
downloadmariadb-git-1c908336061adcc88705c0e8f99ac849bb31b1d6.tar.gz
New alternate UNION syntax and bug fix for multi-table deletes
mysql-test/r/union.result: New results for optional UNION syntax mysql-test/t/union.test: New test for alternate syntax for UNION sql/sql_delete.cc: Fixed bug in multi-table delete's with transactional tables sql/sql_parse.cc: A small change to enable new UNION syntax sql/sql_union.cc: New alternate UNION syntax sql/sql_yacc.yy: New alternate UNION syntax
Diffstat (limited to 'mysql-test/r/union.result')
-rw-r--r--mysql-test/r/union.result6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index 3d4b79ea78d..f2572321d61 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -68,6 +68,12 @@ t2 c 1
t2 d 1
t2 e 1
t2 f 1
+(select a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 4;
+a b
+1 a
+2 b
+3 c
+4 d
explain select a,b from t1 union all select a,b from t2;
table type possible_keys key key_len ref rows Extra
t1 ALL NULL NULL NULL NULL 4