Merge fix for BUG#869012

This commit is contained in:
Sergey Petrunya 2011-10-11 21:57:57 +04:00
commit 8392fa8391
6 changed files with 61 additions and 2591 deletions

View file

@ -7969,7 +7969,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
*/
JOIN_TAB *first_inner_tab= tab->first_inner;
if (tab->table)
if (!tab->bush_children)
current_map= tab->table->map;
else
current_map= tab->bush_children->start->emb_sj_nest->sj_inner_tables;