database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2020-05-09 20:20:02 +02:00
parent 1a9c593db8 985f63cce1
commit 607467bd63
13 changed files with 566 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_base.cc
View File

@ -4685,10 +4685,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);