diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2011-05-05 08:13:22 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2011-05-05 08:13:22 +0200 |
| commit | 294fb44d67ff1b12e11b7f771d5260ed2b1b97fb (patch) | |
| tree | cd172df35bbbc323a22f426774bc859ed6080cb5 /sql/sql_lex.cc | |
| parent | e889b48749583751895b8f34e1906c93f69d53f0 (diff) | |
| parent | 9baf84e99a6d7edd36c777593a90671d02aacbc9 (diff) | |
| download | mariadb-git-294fb44d67ff1b12e11b7f771d5260ed2b1b97fb.tar.gz | |
merge 5.1 => 5.5 : Bug#12329653
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 5e8ecc6b815..6e3f0a33147 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1755,6 +1755,8 @@ void st_select_lex::init_query() exclude_from_table_unique_test= no_wrap_view_item= FALSE; nest_level= 0; link_next= 0; + m_non_agg_field_used= false; + m_agg_func_used= false; } void st_select_lex::init_select() @@ -1785,7 +1787,8 @@ 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; + m_non_agg_field_used= false; + m_agg_func_used= false; } /* |