summaryrefslogtreecommitdiff
path: root/sql/sql_admin.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-06-02 08:30:33 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-06-02 08:30:33 +0300
commit49ab50f8828b90c975dba1973a7a4873217f49a7 (patch)
tree16a6eec66f134bdfef6c6fea7bdb27792979c1f5 /sql/sql_admin.cc
parent6d21b6acb852ad86678452fe0f78122c75382b03 (diff)
parentd3d2c9656777ac59ce60e4070c0659e50c8796e2 (diff)
downloadmariadb-git-49ab50f8828b90c975dba1973a7a4873217f49a7.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_admin.cc')
-rw-r--r--sql/sql_admin.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 227116a82b2..ec0bc7b0111 100644
--- 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;