diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-05-16 19:20:00 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-05-16 19:20:00 +0400 |
| commit | dfbd777fd83d236cc559750048f0cabee87d93a0 (patch) | |
| tree | fb6cb698aa6f12c54e5a3d67835b9112ea07291d /sql/opt_subselect.cc | |
| parent | ddd3e261b253856720bd9dc2343a655ecc297e81 (diff) | |
| parent | 404a1565bfe02e3ce06843f6c5bf243503a2fe99 (diff) | |
| download | mariadb-git-dfbd777fd83d236cc559750048f0cabee87d93a0.tar.gz | |
MWL#182: SHOW EXPLAIN: Merge 5.3->5.5
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 9bf1aaf4039..34e73f5cac8 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -1656,7 +1656,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); } @@ -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) |