diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 11:04:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 11:04:54 +0300 |
| commit | 5c3ff5cb93f8363820d506cdad3daafbc944f03b (patch) | |
| tree | f5671e95dabd8ced0c7925e54b351bd704e41bcf /sql/sql_admin.cc | |
| parent | f9ab7b473a935141f85d27994d0faf3433a73144 (diff) | |
| parent | 7b42d892de6acc04490f5cb6b8355c72b8f1a406 (diff) | |
| download | mariadb-git-5c3ff5cb93f8363820d506cdad3daafbc944f03b.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 1da345dfbf4..ed48d65fffc 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -566,7 +566,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)) { @@ -1219,9 +1220,6 @@ err: } close_thread_tables(thd); // Shouldn't be needed thd->mdl_context.release_transactional_locks(); -#ifdef WITH_PARTITION_STORAGE_ENGINE -err2: -#endif thd->resume_subsequent_commits(suspended_wfc); DBUG_RETURN(TRUE); } |