mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-28 17:54:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.3 into 10.4

Browse source
This commit is contained in:
Marko Mäkelä 2021-06-02 08:29:47 +03:00
commit d3d2c96567
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;
--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

1
sql/sql_admin.cc
View file

@ -588,6 +588,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;