Skip to content

M
MariaDB
Commit bab4348c authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.3 into 10.4

parents 385f4316 2d38c5e6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/main/lock_kill.test
View file @ bab4348c
...@@ -17,7 +17,7 @@ LOCK TABLE t1 WRITE; ...@@ -17,7 +17,7 @@ LOCK TABLE t1 WRITE;
eval KILL $conid; eval KILL $conid;
--enable_query_log --enable_query_log
--connection con1 --connection con1
--error 0,2013,ER_CONNECTION_KILLED --error 0,2006,2013,ER_CONNECTION_KILLED
reap; reap;
--connection default --connection default
--disconnect con1 --disconnect con1
...@@ -35,7 +35,7 @@ LOCK TABLE t1 WRITE, t2 WRITE; ...@@ -35,7 +35,7 @@ LOCK TABLE t1 WRITE, t2 WRITE;
eval KILL $conid; eval KILL $conid;
--enable_query_log --enable_query_log
--connection con1 --connection con1
--error 0,2013,ER_CONNECTION_KILLED --error 0,2006,2013,ER_CONNECTION_KILLED
reap; reap;
--connection default --connection default
--disconnect con1 --disconnect con1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7