Merge 10.4 into 10.5

MariaDB · Jun 2, 2021 · 49ab50f · 49ab50f
2 parents 6d21b6a + d3d2c96
commit 49ab50f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
+--error 0,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
+--error 0,2013,ER_CONNECTION_KILLED
 reap;
 --connection default
 --disconnect con1

diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
@@ -581,6 +581,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
 
     if (thd->check_killed())
     {
+      open_error= false;
       fatal_error= true;
       result_code= HA_ADMIN_FAILED;
       goto send_result;