diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-04-15 09:16:54 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-04-15 09:16:54 -0700 |
| commit | f4cd2b37b12617ca383e625dfd07ce1468c5b5a8 (patch) | |
| tree | 4720b59562af2f8a4208b3cce4dca649d05b029b /sql/opt_subselect.cc | |
| parent | ab10dc8fafc3ff5448947e698b500bab4042e95e (diff) | |
| parent | 30b2c64c4e87f8924fe817f5c607ae90a990e9e5 (diff) | |
| download | mariadb-git-f4cd2b37b12617ca383e625dfd07ce1468c5b5a8.tar.gz | |
Merge 10.0-base -> mwl253
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 31d3ad337d8..1dc15627627 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -1513,6 +1513,9 @@ static bool convert_subq_to_sj(JOIN *parent_join, Item_in_subselect *subq_pred) */ parent_lex->leaf_tables.concat(&subq_lex->leaf_tables); + if (subq_lex->options & OPTION_SCHEMA_TABLE) + parent_lex->options |= OPTION_SCHEMA_TABLE; + /* Same as above for next_local chain (a theory: a next_local chain always starts with ::leaf_tables @@ -1730,6 +1733,9 @@ static bool convert_subq_to_jtbm(JOIN *parent_join, */ parent_lex->leaf_tables.push_back(jtbm); + if (subq_pred->unit->first_select()->options & OPTION_SCHEMA_TABLE) + parent_lex->options |= OPTION_SCHEMA_TABLE; + /* Same as above for TABLE_LIST::next_local chain (a theory: a next_local chain always starts with ::leaf_tables |