diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-08 13:38:36 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-08 13:38:36 +0200 |
| commit | 985f63cce1057d7b3fd6e86e65a2a2ee7d970073 (patch) | |
| tree | b517479e6778d1701f123b842233a6015bdf12c1 /sql/sql_base.cc | |
| parent | e84c62d59b8036138998b0e521a47bdde4ac3875 (diff) | |
| parent | 530da97c65a8018ef049dfb990df6b98bc5e4ccd (diff) | |
| download | mariadb-git-mariadb-10.2.32.tar.gz | |
Merge branch '10.1' into 10.2mariadb-10.2.32
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index f31c3f36aa8..45916220896 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4445,10 +4445,19 @@ bool Lock_tables_prelocking_strategy:: handle_table(THD *thd, Query_tables_list *prelocking_ctx, TABLE_LIST *table_list, bool *need_prelocking) { + TABLE_LIST **last= prelocking_ctx->query_tables_last; + if (DML_prelocking_strategy::handle_table(thd, prelocking_ctx, table_list, need_prelocking)) return TRUE; + /* + normally we don't need to open FK-prelocked tables for RESTRICT, + MDL is enough. But under LOCK TABLES we have to open everything + */ + for (TABLE_LIST *tl= *last; tl; tl= tl->next_global) + tl->open_strategy= TABLE_LIST::OPEN_NORMAL; + /* We rely on a caller to check that table is going to be changed. */ DBUG_ASSERT(table_list->lock_type >= TL_WRITE_ALLOW_WRITE); |