summaryrefslogtreecommitdiff
path: root/sql/sql_admin.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-06-02 08:29:47 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-06-02 08:29:47 +0300
commitd3d2c9656777ac59ce60e4070c0659e50c8796e2 (patch)
tree573e32a7d12846eea47a928a0057470ca96b2843 /sql/sql_admin.cc
parent77d8da57d744505838a7830afbc437e54cc03c50 (diff)
parentaa70690e9a49df7aa7ea701d94a31be830b90677 (diff)
downloadmariadb-git-d3d2c9656777ac59ce60e4070c0659e50c8796e2.tar.gz
Merge 10.3 into 10.4
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 608aee49ca4..63a71ee4433 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -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;