diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-11-11 21:18:10 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-11-11 21:18:10 +0200 |
| commit | 3bc1fcd409eb08474884a556fef193d707117212 (patch) | |
| tree | b838d2bae358ea54b828bff0e3dfb8a0faf1bc8e /sql/sql_lex.cc | |
| parent | e5fd013fdf6c8664daa0bbdcaf0d22bf44e90d62 (diff) | |
| parent | 5b82bc6644fb766c7a04b49d60e70c474450ce28 (diff) | |
| download | mariadb-git-3bc1fcd409eb08474884a556fef193d707117212.tar.gz | |
merge
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 86219abc632..97c5058cd61 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1041,7 +1041,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; @@ -1635,7 +1635,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); } |