diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-05-25 19:31:13 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-05-25 19:31:13 +0400 |
| commit | 77b3b960b101a0a1dbc2fe0780d8654f4aa21f62 (patch) | |
| tree | 08baa2ad4bf65d72ab765e2beec04e21a9b700d9 /sql/sql_delete.cc | |
| parent | 0a5026b057a9883fd947fa9ec0c5303e42115977 (diff) | |
| parent | f34b421839c78ccc56db4ecc7bbb97929f309801 (diff) | |
| download | mariadb-git-77b3b960b101a0a1dbc2fe0780d8654f4aa21f62.tar.gz | |
Merge MWL#90 with 5.3-main
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 afda3070f08..de597800275 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) { |