database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-07-14 17:13:37 +03:00
parent f3f23b5c4b 07e89bf7d1
commit 8a0944080c
40 changed files with 468 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mysql-test/main/union.test
View File

@ -1200,11 +1200,11 @@ select 4
order by max(42) + max(1) + max(1) + max(1) + max(1) + max(1)
;
--error ER_AGGREGATE_ORDER_FOR_UNION
eval $my_stmt;
--error ER_AGGREGATE_ORDER_FOR_UNION
eval prepare stmt1 from '$my_stmt';
execute stmt1;
execute stmt1;
let $my_stmt=
select 1 as foo
@ -1217,13 +1217,11 @@ union
order by max(42) + max(1) + max(1) + max(1) + max(1) + max(1)
;
--error ER_AGGREGATE_ORDER_FOR_UNION
eval $my_stmt;
--error ER_AGGREGATE_ORDER_FOR_UNION
eval prepare stmt1 from '$my_stmt';
execute stmt1;
execute stmt1;
deallocate prepare stmt1;
--echo End of 5.1 tests
@ -1653,6 +1651,17 @@ eval EXPLAIN EXTENDED $q;
DROP TABLE t1,t2;
--echo #
--echo # MDEV-10120: Wrong result of UNION .. ORDER BY GROUP_CONCAT()
--echo #
CREATE TABLE t1 (a INT);
INSERT t1 VALUES (1),(2),(3);
--error ER_AGGREGATE_ORDER_FOR_UNION
(SELECT 1 AS a) UNION (SELECT a FROM t1 GROUP BY a) ORDER BY GROUP_CONCAT(a);
DROP TABLE t1;
--echo #
--echo # Start of 10.3 tests