summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-06-02 08:29:01 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-06-02 08:29:01 +0300
commitaa70690e9a49df7aa7ea701d94a31be830b90677 (patch)
tree66d1c80961a59bb1c53e7ac919649dfefe58b302
parent4847a2e730877f00971f10de3e2656d2b418fac6 (diff)
parenta8434c6c59e291b65f1e294cafa4555470c3094c (diff)
downloadmariadb-git-aa70690e9a49df7aa7ea701d94a31be830b90677.tar.gz
Merge 10.2 into 10.3
-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 a61aaa0f893..5a625eb4f62 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -536,6 +536,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;