diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-10-06 11:03:37 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-10-06 11:03:37 +0400 |
| commit | 30df032e28bada8aabc1c850799795c728cd96b7 (patch) | |
| tree | 4d7d8b6e481197bcd1cf04368d7c19316b047527 /sql/opt_subselect.cc | |
| parent | 79feec77ed4a7121e68be1dc16f79dcad6c5d25e (diff) | |
| parent | 4d8be2d4f6d7a7b669b7931f1a0ccb5de130fee6 (diff) | |
| download | mariadb-git-30df032e28bada8aabc1c850799795c728cd96b7.tar.gz | |
SHOW EXPLAIN: merge with 5.5-main
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index e70e5a784ba..1c2e037e8cc 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -1657,6 +1657,7 @@ static bool convert_subq_to_sj(JOIN *parent_join, Item_in_subselect *subq_pred) parent_lex->ftfunc_list->push_front(ifm); } + parent_lex->have_merged_subqueries= TRUE; DBUG_RETURN(FALSE); } @@ -1767,6 +1768,8 @@ static bool convert_subq_to_jtbm(JOIN *parent_join, create_subquery_temptable_name(tbl_alias, hash_sj_engine->materialize_join-> select_lex->select_number); jtbm->alias= tbl_alias; + + parent_lex->have_merged_subqueries= TRUE; #if 0 /* Inject sj_on_expr into the parent's WHERE or ON */ if (emb_tbl_nest) |