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 tag 'mariadb-10.2.6' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2017-05-26 19:32:28 +04:00
parent 77b2f55f61 ca7cf69cb1
commit 9bc3225642
514 changed files with 38540 additions and 5838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_base.cc
View File

@ -4262,8 +4262,9 @@ handle_table(THD *thd, Query_tables_list *prelocking_ctx,
else
lock_type= TL_READ;
if (table_already_fk_prelocked(table_list, fk->foreign_db,
fk->foreign_table, lock_type))
if (table_already_fk_prelocked(prelocking_ctx->query_tables,
fk->foreign_db, fk->foreign_table,
lock_type))
continue;
TABLE_LIST *tl= (TABLE_LIST *) thd->alloc(sizeof(TABLE_LIST));