mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-29 11:45:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.0' into 10.1

Browse source
This commit is contained in:
Sergei Golubchik 2015-03-07 13:21:02 +01:00
commit 2db62f686e
728 changed files with 55048 additions and 9876 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/sql_delete.cc
View file

@ -922,9 +922,10 @@ multi_delete::initialize_tables(JOIN *join)
delete_while_scanning= 1;
for (walk= delete_tables; walk; walk= walk->next_local)
{
tables_to_delete_from|= walk->table->map;
TABLE_LIST *tbl= walk->correspondent_table->find_table_for_update();
tables_to_delete_from|= tbl->table->map;
if (delete_while_scanning &&
unique_table(thd, walk, join->tables_list, false))
unique_table(thd, tbl, join->tables_list, false))
{
/*
If the table we are going to delete from appears