diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-06-15 00:50:17 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-06-15 00:50:17 +0400 |
| commit | fb33db56082693df4f0f7409e60ade155e72ac33 (patch) | |
| tree | 8d25d13023446866eabed0acbc4b0f16e58920df /sql/opt_subselect.cc | |
| parent | 9892ace475752e0ddd333500bec91e13ca54d0f3 (diff) | |
| parent | cf8461a0f75eebcc15cddd3c48d5e24f872930c2 (diff) | |
| download | mariadb-git-fb33db56082693df4f0f7409e60ade155e72ac33.tar.gz | |
MWL#182: Explain running statements
- Merge with current 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 a5a68d0d306..d090c2e1445 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) |