diff options
| author | Karen Langford <karen.langford@oracle.com> | 2011-07-06 00:56:51 +0200 |
|---|---|---|
| committer | Karen Langford <karen.langford@oracle.com> | 2011-07-06 00:56:51 +0200 |
| commit | 8c001894f5a9e8350d621243c60870db6de84566 (patch) | |
| tree | eefc26771a8f290ae8b29e9d7ecb41b19010a909 /sql/sql_lex.cc | |
| parent | 986984a314535116e01d212b6ae19c3a0dabc2b8 (diff) | |
| parent | a83ac4ceb231ede7b82aaa47af635b393859968e (diff) | |
| download | mariadb-git-8c001894f5a9e8350d621243c60870db6de84566.tar.gz | |
Merge from mysql-5.1.58-release
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 f5c41b30659..f0289ab86ce 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1623,6 +1623,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() @@ -1653,7 +1655,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; } /* |