diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 10:58:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 10:58:20 +0100 |
| commit | f2a0c758da3d9f0fa42c96114b453cf4835bcbab (patch) | |
| tree | d51cdc29774cfc04f522e2253542d73c94a9728b /sql/sql_admin.cc | |
| parent | fc168c3a5e58d8b364a2e87e0d876a261ec7fced (diff) | |
| parent | d0116e10a5da52503a89a413e481996ce3f65e63 (diff) | |
| download | mariadb-git-f2a0c758da3d9f0fa42c96114b453cf4835bcbab.tar.gz | |
Merge branch '10.1' into 10.2
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 155ed3bcecb..76bb65fba30 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -563,7 +563,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)) { @@ -1216,9 +1217,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); } |