diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-25 13:20:44 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-26 14:08:03 +0200 |
| commit | 619afb151b38a538ef64d5387643c01f86e203d8 (patch) | |
| tree | 850aa65e1c465295d39387a10684379144d70e85 /sql/sql_parse.cc | |
| parent | 03da1253af4b1a9a47ffd7c6904af266718bc0b1 (diff) | |
| download | mariadb-git-619afb151b38a538ef64d5387643c01f86e203d8.tar.gz | |
MDEV-15456 Server crashes upon adding or dropping a partition in ALTER under LOCK TABLE after ER_SAME_NAME_PARTITION
followup for bcb36ee21e2
move reopening before trans_commit_stmt(thd);
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index fa95c852f53..4c0be4ebc8b 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5136,6 +5136,10 @@ finish: lex->unit.cleanup(); + /* close/reopen tables that were marked to need reopen under LOCK TABLES */ + if (! thd->lex->requires_prelocking()) + thd->locked_tables_list.reopen_tables(thd, true); + if (! thd->in_sub_stmt) { if (thd->killed != NOT_KILLED) |