summaryrefslogtreecommitdiff
path: root/sql/sql_admin.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_admin.cc')
-rw-r--r--sql/sql_admin.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index cbc9780d507..0ec6719037c 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -528,7 +528,8 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
if (!table->table->part_info)
{
my_error(ER_PARTITION_MGMT_ON_NONPARTITIONED, MYF(0));
- goto err2;
+ thd->resume_subsequent_commits(suspended_wfc);
+ DBUG_RETURN(TRUE);
}
if (set_part_state(alter_info, table->table->part_info, PART_ADMIN))
{
@@ -1159,7 +1160,6 @@ err:
}
close_thread_tables(thd); // Shouldn't be needed
thd->mdl_context.release_transactional_locks();
-err2:
thd->resume_subsequent_commits(suspended_wfc);
DBUG_RETURN(TRUE);
}