Merge 10.3 into 10.4

bab4348c · Marko Mäkelä · 385f4316 · 2d38c5e6 · bab4348c
Commit bab4348c authored Jun 04, 2021 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/main/lock_kill.test mysql-test/main/lock_kill.test +2 -2

No files found.
--- a/mysql-test/main/lock_kill.test
+++ b/mysql-test/main/lock_kill.test
@@ -17,7 +17,7 @@ LOCK TABLE t1 WRITE;
 eval KILL $conid;
 --enable_query_log
 --connection con1
--error 0,2013,ER_CONNECTION_KILLED
+--error 0,2006,2013,ER_CONNECTION_KILLED
 reap;
 --connection default
 --disconnect con1
@@ -35,7 +35,7 @@ LOCK TABLE t1 WRITE, t2 WRITE;
 eval KILL $conid;
 --enable_query_log
 --connection con1
--error 0,2013,ER_CONNECTION_KILLED
+--error 0,2006,2013,ER_CONNECTION_KILLED
 reap;
 --connection default
 --disconnect con1