diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-02-16 13:59:14 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-02-16 13:59:14 +0300 |
| commit | e69c642920224680528c0c8548ff52c674bee3d9 (patch) | |
| tree | 642c606aac26ae26cda599f4d57465d27ab82e01 /sql/sql_join_cache.cc | |
| parent | 716091e2a058644b81755ec3f3b1f736b0c84782 (diff) | |
| download | mariadb-git-e69c642920224680528c0c8548ff52c674bee3d9.tar.gz | |
Post-merge fixes part 5
Diffstat (limited to 'sql/sql_join_cache.cc')
| -rw-r--r-- | sql/sql_join_cache.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index fbbcf395980..68cb0c86adb 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -235,8 +235,13 @@ psergey-merge: was: } } start_tab= tab; + /* while (start_tab->bush_children && start_tab != join_tab) start_tab++; + */ + if (start_tab->bush_children) + start_tab= start_tab->bush_children->start; + tab= start_tab; //tables= join_tab-tab; |