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

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-06-06 17:51:28 +02:00
parent 1ff1cb10fc 33ef993773
commit 4749d40c63
464 changed files with 7741 additions and 3075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_delete.cc
View File

@ -682,7 +682,7 @@ multi_delete::initialize_tables(JOIN *join)
tab;
tab= next_linear_tab(join, tab, WITHOUT_BUSH_ROOTS))
{
if (tab->table->map & tables_to_delete_from)
if (!tab->bush_children && tab->table->map & tables_to_delete_from)
{
/* We are going to delete from this table */
TABLE *tbl=walk->table=tab->table;