diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-04 09:42:18 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-04 09:42:18 +0300 |
| commit | bab4348c6c1253f8d23f688f7ac083a4e902b701 (patch) | |
| tree | 552dccaafc318d26aec21d76b492bdfe160c944f | |
| parent | 385f4316c3b8250943383145c115000ee153e3de (diff) | |
| parent | 2d38c5e64edbfdc8368954775880c2d677fbd195 (diff) | |
| download | mariadb-git-bab4348c6c1253f8d23f688f7ac083a4e902b701.tar.gz | |
Merge 10.3 into 10.4
| -rw-r--r-- | mysql-test/main/lock_kill.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/lock_kill.test b/mysql-test/main/lock_kill.test index dfeebbc4f6a..2c1396e5ff3 100644 --- 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 |