diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-04-02 14:09:00 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-04-02 14:09:00 +0400 |
| commit | 8fb724281e00757c4a81c57b081602b3cb4e6726 (patch) | |
| tree | 428e55fc35e017a80ef28cba76f3fbbf85fda97d /sql/sql_show.cc | |
| parent | d5adc29d1c39027c827074f936d3f28e71f87800 (diff) | |
| parent | b86abed53de628c650a1c47a0287aaa32228a051 (diff) | |
| download | mariadb-git-8fb724281e00757c4a81c57b081602b3cb4e6726.tar.gz | |
Merge MWL#90 with main 5.3 tree
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 833b695e4bf..06d55a661eb 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -6615,14 +6615,15 @@ int make_schema_select(THD *thd, SELECT_LEX *sel, bool get_schema_tables_result(JOIN *join, enum enum_schema_table_state executed_place) { - JOIN_TAB *tmp_join_tab= join->join_tab+join->tables; THD *thd= join->thd; LEX *lex= thd->lex; bool result= 0; DBUG_ENTER("get_schema_tables_result"); thd->no_warnings_for_error= 1; - for (JOIN_TAB *tab= join->join_tab; tab < tmp_join_tab; tab++) + for (JOIN_TAB *tab= first_linear_tab(join, WITH_CONST_TABLES); + tab; + tab= next_linear_tab(join, tab, WITHOUT_BUSH_ROOTS)) { if (!tab->table || !tab->table->pos_in_table_list) break; |