diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-10-27 21:41:19 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-10-27 21:41:19 +0400 |
| commit | 286a751490cd109a470e30ef486755cd4922802d (patch) | |
| tree | c872e9c0ead4815600c2e1e490346e5805d16fec /sql/opt_subselect.cc | |
| parent | 08e9e6a790ea6ba8bbe6fa5c5bd54677f4add072 (diff) | |
| parent | ba09d25abc1fd3dbe55f1d7974cfe6a1ebda4df0 (diff) | |
| download | mariadb-git-286a751490cd109a470e30ef486755cd4922802d.tar.gz | |
MWL#182: Explain running statements
- Merge with 5.3-main
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 416dcadc67f..6fd307787a2 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -1386,7 +1386,8 @@ static bool convert_subq_to_sj(JOIN *parent_join, Item_in_subselect *subq_pred) while ((ifm= li++)) parent_lex->ftfunc_list->push_front(ifm); } - + + parent_lex->have_merged_subqueries= TRUE; DBUG_RETURN(FALSE); } @@ -1499,6 +1500,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) |