diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 16:36:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 16:52:12 +0300 |
| commit | 18934fb58309f4491b34273b2781cce68f6d6e22 (patch) | |
| tree | e9e43e81979561fd5aec9d17dddd5cb6ea02e93f /sql/sql_admin.cc | |
| parent | 8a42ad7a5d3168b7ce92a38652d77424336a32b8 (diff) | |
| parent | 6aa50bad3947a0eab24fb029cd58f5945439e365 (diff) | |
| download | mariadb-git-18934fb58309f4491b34273b2781cce68f6d6e22.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 49e14d6b013..a14a8cd0945 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -1216,7 +1216,9 @@ 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); } |