diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-05-29 12:58:44 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-05-29 12:58:44 +0400 |
| commit | 5cd18326c2167ddf1fe989154c519809cd26f175 (patch) | |
| tree | 0166109cba0ae1b9b6bfa81d8c38ecd1a0fe2276 /sql/sql_delete.cc | |
| parent | 8ce2e1bcbe1f00b6030b1c82ea62b3a64b1d0de9 (diff) | |
| parent | 4efe046352f61cc7b8a44a604f96f8b68cf155c0 (diff) | |
| download | mariadb-git-5cd18326c2167ddf1fe989154c519809cd26f175.tar.gz | |
Merge 5.3->main -> 5.3-mwl90
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 5b5565000da..d1183e29be5 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -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) { |