Merge 5.3->main -> 5.3-mwl90

This commit is contained in:
Sergey Petrunya 2011-05-29 12:58:44 +04:00
commit 5cd18326c2
40 changed files with 5348 additions and 1929 deletions

View file

@ -681,9 +681,10 @@ multi_delete::initialize_tables(JOIN *join)
walk= delete_tables;
for (JOIN_TAB *tab=join->join_tab, *end=join->join_tab+join->tables;
tab < end;
tab++)
for (JOIN_TAB *tab= first_linear_tab(join, WITH_CONST_TABLES);
tab;
tab= next_linear_tab(join, tab, WITH_BUSH_ROOTS))
{
if (tab->table->map & tables_to_delete_from)
{