diff options
| author | unknown <evgen@moonbone.local> | 2008-03-28 18:09:14 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2008-03-28 18:09:14 +0300 |
| commit | fbbb60ce2f35b93a21229d585b7a27d7c5c50adc (patch) | |
| tree | 31732e6de3b8d61202db7baddd0a4627816a31ae /sql/sql_lex.cc | |
| parent | 9d0385d62bfb439855ec8de027776ef847f47369 (diff) | |
| parent | 7c156537cc51c42ae58c61f6bb70a307b8216334 (diff) | |
| download | mariadb-git-fbbb60ce2f35b93a21229d585b7a27d7c5c50adc.tar.gz | |
Merge moonbone.local:/work/27219-5.0-opt-mysql
into moonbone.local:/work/27219-bug-5.1
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/group_by.result:
SCCS merged
mysql-test/t/group_by.test:
SCCS merged
sql/item.cc:
SCCS merged
sql/sql_lex.h:
SCCS merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index b07efc62a00..449c2fccb0b 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1601,6 +1601,7 @@ void st_select_lex::init_select() non_agg_fields.empty(); cond_value= having_value= Item::COND_UNDEF; inner_refs_list.empty(); + full_group_by_flag= 0; } /* @@ -1836,8 +1837,6 @@ bool st_select_lex::test_limit() "LIMIT & IN/ALL/ANY/SOME subquery"); return(1); } - // no sense in ORDER BY without LIMIT - order_list.empty(); return(0); } |