diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-01-14 13:07:50 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-01-14 13:07:50 +0300 |
| commit | 7fd3c9e2ffd3992e514d6149484a89d32b65e277 (patch) | |
| tree | f336b4ee2848f496748f7385041328fb39686803 /sql/sql_join_cache.cc | |
| parent | ad78c24a20278f072017f3b0e397d01fc0ccec9f (diff) | |
| parent | b266e5b972ec05ce82cccf829abf6c137e090cdd (diff) | |
| download | mariadb-git-7fd3c9e2ffd3992e514d6149484a89d32b65e277.tar.gz | |
Merge backported subquery bugfixes/testcases into MariaDB 5.3
Diffstat (limited to 'sql/sql_join_cache.cc')
| -rw-r--r-- | sql/sql_join_cache.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index 6c94ccede47..6f22ba7bcea 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -169,9 +169,17 @@ JOIN_TAB *JOIN_CACHE::get_next_table(JOIN_TAB *tab) if (join_tab->first_sjm_sibling) return tab; uint i= tab-join->join_tab; + /* + Temporary measure before MWL#90 refactorings are there: if 'tab' is at upper + level (i.e. it's not inside an SJM nest), still include into the join buffer + the tables from within SJM nest. We might need the subquery's select list + columns, because SJ-Materialization-Scan upacks data to those. + while (sj_is_materialize_strategy(join->best_positions[i].sj_strategy) && i < join->tables) i+= join->best_positions[i].n_sj_tables; + + */ return join->join_tab+i < join_tab ? join->join_tab+i : NULL; } |