mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Merge 10.3 into 10.4
This commit is contained in:
commit
bab4348c6c
1 changed files with 2 additions and 2 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue