diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-03-30 14:38:38 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-03-30 14:38:38 +0400 |
| commit | b86abed53de628c650a1c47a0287aaa32228a051 (patch) | |
| tree | 3ab84c5cf806f0b72b4ea7b42e3be2d6d78b5010 | |
| parent | dc937fb53b33fc7c58612bf3f7ac1ab189393729 (diff) | |
| download | mariadb-git-b86abed53de628c650a1c47a0287aaa32228a051.tar.gz | |
MWL#90: Address review feedback part #17
| -rw-r--r-- | sql/sql_select.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 7a306f26703..8278b91df50 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7808,7 +7808,8 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) OUTER_REF_TABLE_BIT | RAND_TABLE_BIT); for (JOIN_TAB *tab= first_linear_tab(join, WITHOUT_CONST_TABLES); tab; - tab= next_linear_tab(join, tab, WITH_BUSH_ROOTS)) + tab= (tab == last_tab)? NULL: next_linear_tab(join, tab, + WITH_BUSH_ROOTS)) { if (!tab->table) { @@ -7864,8 +7865,8 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) if (cond_tab->select) cond_tab->select->cond= cond_tab->select_cond; } - if (tab == last_tab) - break; + //if (tab == last_tab) //psergey-todo: fix this. + // break; } first_inner_tab= first_inner_tab->first_upper; } |