diff options
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index f5382e6df99..e6c9f973b9b 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1006,7 +1006,7 @@ void st_select_lex::init_query() table_list.empty(); top_join_list.empty(); join_list= &top_join_list; - embedding= 0; + embedding= leaf_tables= 0; item_list.empty(); join= 0; where= prep_where= 0; @@ -1564,7 +1564,7 @@ bool st_lex::can_be_merged() select_lex.group_list.elements == 0 && select_lex.having == 0 && select_lex.with_sum_func == 0 && - select_lex.table_list.elements == 1 && + select_lex.table_list.elements >= 1 && !(select_lex.options & SELECT_DISTINCT) && select_lex.select_limit == HA_POS_ERROR); } |