database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-06-02 11:31:01 +03:00
parent 3dd91241cb 8426c7411b
commit 06dd151bb8
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_admin.cc
View File

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