Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä 2021-06-04 09:42:18 +03:00
commit bab4348c6c

View file

@ -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