diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2011-05-04 17:12:45 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2011-05-04 17:12:45 +0200 |
| commit | 9baf84e99a6d7edd36c777593a90671d02aacbc9 (patch) | |
| tree | 4b2a82480afbf07a0e4ba4447dbf4f3a51761bbe /sql/sql_lex.cc | |
| parent | c00c350f147173bf20c35c8787cdf0d840653e96 (diff) | |
| parent | a32df762d43c29545718e8a78a1721a9a7a1a35f (diff) | |
| download | mariadb-git-9baf84e99a6d7edd36c777593a90671d02aacbc9.tar.gz | |
merge 5.0 => 5.1 : 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 9ea144df9bc..346217937fe 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1621,6 +1621,8 @@ void st_select_lex::init_query() nest_level= 0; link_next= 0; lock_option= TL_READ_DEFAULT; + m_non_agg_field_used= false; + m_agg_func_used= false; } void st_select_lex::init_select() @@ -1651,7 +1653,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; } /* |