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

Merge branch '10.4' into 10.5

This commit is contained in:
Oleksandr Byelkin
2022-08-03 07:12:27 +02:00
73 changed files with 664 additions and 632 deletions

View File

@ -57,7 +57,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
SET DEBUG_SYNC = 'RESET';
connection con1;
--error 1053,2006,2013
--error 1053,2006,2013,5014
SELECT 1;
--enable_reconnect
@ -96,7 +96,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
SET DEBUG_SYNC = 'RESET';
connection con1;
--error 1053,2006,2013
--error 1053,2006,2013,5014
SELECT 1;
enable_reconnect;
SELECT 1;
@ -143,7 +143,7 @@ KILL @id;
SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
connection con1;
--error 1317,1053,2006,2013
--error 1317,1053,2006,2013,5014
reap;
SELECT 1;
@ -288,7 +288,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con1_end';
connection con1;
--echo # ER_SERVER_SHUTDOWN, CR_SERVER_GONE_ERROR, CR_SERVER_LOST,
--echo # depending on the timing of close of the connection socket
--error 1053,2006,2013
--error 1053,2006,2013,5014
SELECT 1;
--enable_reconnect
SELECT 1;
@ -521,10 +521,10 @@ drop user test@localhost;
drop user test2@localhost;
connection con3;
--error 2013,2006
--error 2013,2006,5014
select 1;
connection con4;
--error 2013,2006
--error 2013,2006,5014
select 1;
connection default;