Merge 10.2 into 10.3

MariaDB · Jun 2, 2021 · aa70690 · aa70690
2 parents 4847a2e + a8434c6
commit aa70690
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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;