diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-26 11:54:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-26 11:54:55 +0300 |
| commit | ca38b6e42791a6edbd3cc0b626a8d06b7776e76b (patch) | |
| tree | f0b9f34521554ce94ef9a5bd6c7e5f595459240f /sql/sql_parse.cc | |
| parent | ea7830eef48333e28f98a9b91f05a95735b465a3 (diff) | |
| parent | 7476e8c7cdd73d60294126a2840baee97e7644b6 (diff) | |
| download | mariadb-git-ca38b6e42791a6edbd3cc0b626a8d06b7776e76b.tar.gz | |
Merge 10.3 into 10.4
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 c0711ac5090..a7f2f472b0a 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -6128,7 +6128,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) |