diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-10-11 21:57:57 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-10-11 21:57:57 +0400 |
| commit | 8392fa8391a88832f5ee8584ecb38ca00bf00668 (patch) | |
| tree | 7f4d78d1c45876006866679b77b774e32915282b /sql | |
| parent | ae6330080102f31edd6cd3b49028f0f3e39be769 (diff) | |
| parent | 039da95e3d74573a684008c8ea030d285ec98390 (diff) | |
| download | mariadb-git-8392fa8391a88832f5ee8584ecb38ca00bf00668.tar.gz | |
Merge fix for BUG#869012
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 152030d0581..d056c809360 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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; |