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.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 10:55:08 +03:00
parent 21b20712a3 c6e4ea682c
commit 63913ce5af
519 changed files with 5110 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/get_diagnostics.test
View File

@ -284,6 +284,7 @@ GET DIAGNOSTICS CONDITION ABS(2) @var = CLASS_ORIGIN;
GET DIAGNOSTICS CONDITION 1.1 @var = CLASS_ORIGIN;
GET DIAGNOSTICS CONDITION "1" @var = CLASS_ORIGIN;
--disable_cursor_protocol
# Reset warnings
SELECT COUNT(max_questions) INTO @var FROM mysql.user;
@ -303,6 +304,7 @@ GET DIAGNOSTICS CONDITION @cond @var1 = CLASS_ORIGIN;
# Reset warnings
SELECT COUNT(max_questions) INTO @var FROM mysql.user;
--enable_cursor_protocol
DELIMITER |;
CREATE PROCEDURE p1()
@ -367,7 +369,9 @@ GET DIAGNOSTICS @var = NUMBER;
SELECT @var;
--enable_view_protocol
--disable_cursor_protocol
SELECT COUNT(max_questions) INTO @var FROM mysql.user;
--enable_cursor_protocol
GET DIAGNOSTICS @var = NUMBER;
SELECT @var;