diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 14:51:22 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 14:51:22 +0300 |
commit | e67daa5653490074850bc9f5d2deef58f2a10d8e (patch) | |
tree | cf631a1ff96be08423d909702ca3558fda6e56c0 /mysql-test/main/parser.test | |
parent | eb2eaba7fdbd13c9814ab4619cc23d9f140e5485 (diff) | |
parent | ced3ec4c9ce0853c564532fbe90656cf1c3c2bed (diff) | |
download | mariadb-git-e67daa5653490074850bc9f5d2deef58f2a10d8e.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/parser.test')
-rw-r--r-- | mysql-test/main/parser.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/main/parser.test b/mysql-test/main/parser.test index c3b4baaf95a..f99758a8ebd 100644 --- a/mysql-test/main/parser.test +++ b/mysql-test/main/parser.test @@ -1084,7 +1084,9 @@ CREATE TABLE t1 AS SELECT 1 LIMIT 1 UNION SELECT 2; --echo # For now, we're testing the parser. CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (10),(20),(30); +--error ER_AGGREGATE_ORDER_FOR_UNION SELECT 1 AS a UNION SELECT a FROM t1 GROUP BY a ORDER BY GROUP_CONCAT(a); +--error ER_AGGREGATE_ORDER_FOR_UNION SELECT 1 AS a UNION SELECT a FROM t1 GROUP BY a ORDER BY GROUP_CONCAT(a ORDER BY a); DROP TABLE t1; @@ -1125,8 +1127,11 @@ DROP TABLE t1; CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (10),(20),(30); +--error ER_AGGREGATE_ORDER_FOR_UNION SELECT 1 AS a UNION SELECT a FROM t1 GROUP BY a WITH ROLLUP ORDER BY GROUP_CONCAT(a); +--error ER_AGGREGATE_ORDER_FOR_UNION SELECT 1 AS a UNION SELECT a FROM t1 GROUP BY a WITH ROLLUP ORDER BY GROUP_CONCAT(a ORDER BY a); +--error ER_AGGREGATE_ORDER_FOR_UNION SELECT 1 AS a UNION SELECT a FROM t1 GROUP BY a WITH ROLLUP ORDER BY GROUP_CONCAT(a ORDER BY a) LIMIT 1; DROP TABLE t1; |