diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 19:40:56 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 19:41:41 +0100 |
| commit | 4e1d3f83b79cd5f3a920937b462e585fdfb5a35d (patch) | |
| tree | 07e099b50109bd09ff8a5267c5cb5e0bf89597b4 /sql/sql_admin.cc | |
| parent | a82cfe109cbc033253ddaba82f9c2de663601002 (diff) | |
| parent | cc71e7501cb623b2d600c47dbe10a31dcf6e8fcf (diff) | |
| download | mariadb-git-4e1d3f83b79cd5f3a920937b462e585fdfb5a35d.tar.gz | |
Merge branch '10.2' into 10.3
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 4afe34ba18d..853b34f8ad2 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); } |