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/locking_clause.test
View File

@ -152,6 +152,7 @@ DROP USER test2@localhost;
--echo # MYSQL 8
--echo #
--disable_cursor_protocol
--enable_prepare_warnings
SELECT 1 FROM DUAL LIMIT 1 INTO @var FOR UPDATE;
SELECT 1 FROM DUAL LIMIT 1 FOR UPDATE INTO @var;
@ -163,3 +164,4 @@ SELECT 1 FROM DUAL LIMIT 1 INTO @var FOR UPDATE INTO @var;
SELECT 1 UNION SELECT 1 FOR UPDATE INTO @var;
SELECT 1 UNION SELECT 1 INTO @var FOR UPDATE;
--disable_prepare_warnings
--enable_cursor_protocol