diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-25 19:41:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-25 19:41:58 +0300 |
| commit | ecc7f305dde85d704a37e584c29df0ed3f97f7be (patch) | |
| tree | 31810998f5f198e105c0f1f8e5acd6c9e7a581c3 /sql/sql_parse.cc | |
| parent | 736ca14323fa16e409378f0da8005bce4be6dcf8 (diff) | |
| parent | 5530a93f47324b847c799d00a2756729a2869d13 (diff) | |
| download | mariadb-git-ecc7f305dde85d704a37e584c29df0ed3f97f7be.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index ac384ece24a..58f9f7cc9d5 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -6056,7 +6056,8 @@ finish: lex->unit.cleanup(); /* close/reopen tables that were marked to need reopen under LOCK TABLES */ - if (! thd->lex->requires_prelocking()) + if (unlikely(thd->locked_tables_list.some_table_marked_for_reopen) && + !thd->lex->requires_prelocking()) thd->locked_tables_list.reopen_tables(thd, true); if (! thd->in_sub_stmt) |