database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/parser.test
View File

@ -896,6 +896,7 @@ SELECT 1 FROM t1 UNION SELECT 1 FROM t1 ORDER BY 1 LIMIT 1 FOR UPDATE;
--echo # "INTO" clause tests
--disable_cursor_protocol
--enable_prepare_warnings
SELECT 1 FROM t1 INTO @var17727401;
SELECT 1 FROM DUAL INTO @var17727401;
@ -942,6 +943,7 @@ SELECT 1 INTO @var17727401 FROM t1 PROCEDURE ANALYSE();
--error ER_PARSE_ERROR
SELECT 1 FROM t1 PROCEDURE ANALYSE() INTO @var17727401;
--enable_cursor_protocol
--echo # ORDER and LIMIT clause combinations