1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä 2021-06-02 08:30:33 +03:00
commit 49ab50f882
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/lock_kill.test
View File

@ -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 --error 0,2013,ER_CONNECTION_KILLED
reap; reap;
--connection default --connection default
--disconnect con1 --disconnect con1
@ -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 --error 0,2013,ER_CONNECTION_KILLED
reap; reap;
--connection default --connection default
--disconnect con1 --disconnect con1

1
sql/sql_admin.cc
View File

@ -581,6 +581,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
if (thd->check_killed()) if (thd->check_killed())
{ {
open_error= false;
fatal_error= true; fatal_error= true;
result_code= HA_ADMIN_FAILED; result_code= HA_ADMIN_FAILED;
goto send_result; goto send_result;