diff options
Diffstat (limited to 'mysql-test/main/union.test')
| -rw-r--r-- | mysql-test/main/union.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/main/union.test b/mysql-test/main/union.test index 2e5a04a27f4..7e0147cd337 100644 --- a/mysql-test/main/union.test +++ b/mysql-test/main/union.test @@ -93,6 +93,7 @@ select 1 as a,(select a union select a); SELECT @a:=1 UNION SELECT @a:=@a+1; --error 1054 (SELECT 1) UNION (SELECT 2) ORDER BY (SELECT a); +--sorted_result (SELECT 1,3) UNION (SELECT 2,1) ORDER BY (SELECT 2); # @@ -986,7 +987,9 @@ DROP TABLE t1; (select 1) union (select 1 into @var); --error ER_PARSE_ERROR (select 2) union (select 1 into @var); +--enable_prepare_warnings (select 1) union (select 1) into @var; +--disable_prepare_warnings --error ER_TOO_MANY_ROWS (select 2) union (select 1) into @var; @@ -1114,9 +1117,11 @@ SELECT a FROM t1 UNION SELECT a INTO @v FROM t1; SELECT a FROM t1 UNION SELECT a INTO OUTFILE 'union.out.file5' FROM t1; --error ER_PARSE_ERROR SELECT a FROM t1 UNION SELECT a INTO OUTFILE 'union.out.file6' FROM t1; +--enable_prepare_warnings SELECT a FROM t1 UNION SELECT a FROM t1 INTO @v ; SELECT a FROM t1 UNION SELECT a FROM t1 INTO OUTFILE 'union.out.file5'; SELECT a FROM t1 UNION SELECT a FROM t1 INTO OUTFILE 'union.out.file6'; +--disable_prepare_warnings --error ER_PARSE_ERROR SELECT a INTO @v FROM t1 UNION SELECT a FROM t1; --error ER_PARSE_ERROR |