diff options
| author | Galina Shalygina <galashalygina@gmail.com> | 2016-05-25 00:34:13 +0300 |
|---|---|---|
| committer | Galina Shalygina <galashalygina@gmail.com> | 2016-05-25 00:34:13 +0300 |
| commit | 6c6c3af6aac428df8a934beeba15cc4ce77cbe01 (patch) | |
| tree | 2f8241944db8952e6a54a417414773dd0b5b0b4e /mysql-test/t/union.test | |
| parent | b4f1f42062d108230b62ad49fedd93ee6e38e168 (diff) | |
| parent | c7c2f8d4a0dedd52795b7f8a6971c35ea46cc016 (diff) | |
| download | mariadb-git-10.2-test1234.tar.gz | |
Merge branch '10.2' into 10.2-mdev986410.2-test1234
Diffstat (limited to 'mysql-test/t/union.test')
| -rw-r--r-- | mysql-test/t/union.test | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index f2026a67bc2..151512515b9 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -50,13 +50,13 @@ explain select 1 union select a,b from t1 union select 1; --error 1222 explain select a,b from t1 union select 1 limit 0; ---error 1221 +--error ER_PARSE_ERROR select a,b from t1 into outfile 'skr' union select a,b from t2; ---error 1221 +--error ER_PARSE_ERROR select a,b from t1 order by a union select a,b from t2; ---error 1221 +--error ER_PARSE_ERROR insert into t3 select a from t1 order by a union select a from t2; --error 1222 @@ -236,7 +236,7 @@ SELECT COUNT(*) FROM ( select found_rows(); # In these case found_rows() should work ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION all SELECT * FROM t2 LIMIT 2; SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION all SELECT * FROM t2 LIMIT 2; select found_rows(); @@ -253,17 +253,17 @@ SELECT COUNT(*) FROM ( SELECT * FROM t1 UNION all SELECT * FROM t2) q; SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 100; select found_rows(); ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 100 UNION SELECT * FROM t2; SELECT COUNT(*) FROM ( (SELECT * FROM t1 LIMIT 100) UNION SELECT * FROM t2) q; (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 100) UNION SELECT * FROM t2; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION SELECT * FROM t2; SELECT COUNT(*) FROM ( (SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; (SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1) UNION SELECT * FROM t2; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 1 UNION SELECT * FROM t2 LIMIT 2; SELECT COUNT(*) FROM ( (SELECT * FROM t1 LIMIT 1) UNION SELECT * FROM t2) q; @@ -272,7 +272,7 @@ SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 2,2; select found_rows(); SELECT COUNT(*) FROM ( SELECT * FROM t1 UNION SELECT * FROM t2) q; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR SELECT SQL_CALC_FOUND_ROWS * FROM t1 limit 2,2 UNION SELECT * FROM t2; SELECT COUNT(*) FROM ( (SELECT * FROM t1 limit 2,2) UNION SELECT * FROM t2) q; @@ -999,7 +999,7 @@ SELECT a,1 FROM t1 UNION (SELECT b, COUNT(*) FROM t2 GROUP BY b WITH ROLLUP ORDER BY a); ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR SELECT a,1 FROM t1 UNION ALL SELECT b, COUNT(*) FROM t2 GROUP BY b WITH ROLLUP ORDER BY a @@ -1087,11 +1087,11 @@ SELECT a INTO DUMPFILE 'union.out.file2' FROM ( 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; SELECT a FROM t1 UNION SELECT a INTO OUTFILE 'union.out.file6' FROM t1; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR SELECT a INTO @v FROM t1 UNION SELECT a FROM t1; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR SELECT a INTO OUTFILE 'union.out.file7' FROM t1 UNION SELECT a FROM t1; ---error ER_WRONG_USAGE +--error ER_PARSE_ERROR SELECT a INTO DUMPFILE 'union.out.file8' FROM t1 UNION SELECT a FROM t1; -- echo # Tests fix in parser rule query_expression_body. |