diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-09 17:12:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-09 17:12:26 +0200 |
| commit | cfeedbfd3e292f61c7da8f0a7f86307cbeeddb64 (patch) | |
| tree | 3629d1de148b14915a35a21f809e1a2ea6a08619 /sql/sql_show.cc | |
| parent | bff1af983ad7b0bed6c3973e4d13297df5fe2791 (diff) | |
| parent | 16c4b3c68b06653592a9500050ad977a38f4ebae (diff) | |
| download | mariadb-git-cfeedbfd3e292f61c7da8f0a7f86307cbeeddb64.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 103d39e7fd0..853c2888a6a 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -8104,13 +8104,14 @@ bool get_schema_tables_result(JOIN *join, TABLE_LIST *table_list= tab->table->pos_in_table_list; if (table_list->schema_table && thd->fill_information_schema_tables()) { -#if MYSQL_VERSION_ID > 100105 -#error I_S tables only need to be re-populated if make_cond_for_info_schema() will preserve outer fields - bool is_subselect= (&lex->unit != lex->current_select->master_unit() && - lex->current_select->master_unit()->item); -#else -#define is_subselect false -#endif + /* + I_S tables only need to be re-populated if make_cond_for_info_schema() + preserves outer fields + */ + bool is_subselect= &lex->unit != lex->current_select->master_unit() && + lex->current_select->master_unit()->item && + tab->select_cond && + tab->select_cond->used_tables() & OUTER_REF_TABLE_BIT; /* A value of 0 indicates a dummy implementation */ if (table_list->schema_table->fill_table == 0) |