Merge 10.2 into 10.3

aa70690e · Marko Mäkelä · 4847a2e7 · a8434c6c · aa70690e
Commit aa70690e authored Jun 02, 2021 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

sql/sql_admin.cc sql/sql_admin.cc +1 -0

No files found.
--- 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;