database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.11' into 11.0

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-08 21:03:46 +02:00
parent f2b4972bd4 036df5f970
commit 51f9d62005
870 changed files with 11721 additions and 6311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/merge/merge.test
View File

@ -2001,7 +2001,9 @@ BEGIN
RETURN (SELECT MAX(c1) FROM tm1);
END|
DELIMITER ;|
--disable_ps2_protocol
SELECT f1() FROM (SELECT 1 UNION SELECT 1) c1;
--enable_ps2_protocol
DROP FUNCTION f1;
DROP TABLE tm1, t1, t2;
#