summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2018-05-07 17:20:39 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2018-05-07 17:20:39 +0300
commite1ffb66449efa44e99d51c2a01c51d1623342d62 (patch)
tree7ce4e13ba915e8a6a0d50cc1adf7beacc8514a36 /sql/sql_parse.cc
parent648cf7176cc95f697abd8b94e860c74768680298 (diff)
parent42fac3241368ad72f8cfef2b8521269e6c173558 (diff)
downloadmariadb-git-e1ffb66449efa44e99d51c2a01c51d1623342d62.tar.gz
Merge tag 'mariadb-10.0.35' into 10.0-galera
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index f60134b6162..c353c50d8c0 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5600,6 +5600,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)