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 | f6398a86dde400bc97009350c61dd9a9d3c1d715 (patch) | |
| tree | eefc26771a8f290ae8b29e9d7ecb41b19010a909 /sql/item_sum.cc | |
| parent | c2e8aacb3f4fa952d4a9f6757dad1654ec70f49b (diff) | |
| parent | ae46a66099cfe66e9423a2cc9ef0c5e2097ae73d (diff) | |
| download | mariadb-git-f6398a86dde400bc97009350c61dd9a9d3c1d715.tar.gz | |
Merge from mysql-5.1.58-release
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index d480fae8a4c..40ac31918be 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -247,10 +247,10 @@ bool Item_sum::check_sum_func(THD *thd, Item **ref) in_sum_func->outer_fields.push_back(field); } else - sel->full_group_by_flag|= NON_AGG_FIELD_USED; + sel->set_non_agg_field_used(true); } if (sel->nest_level > aggr_level && - (sel->full_group_by_flag & SUM_FUNC_USED) && + (sel->agg_func_used()) && !sel->group_list.elements) { my_message(ER_MIX_OF_GROUP_FUNC_AND_FIELDS, @@ -259,7 +259,7 @@ bool Item_sum::check_sum_func(THD *thd, Item **ref) } } } - aggr_sel->full_group_by_flag|= SUM_FUNC_USED; + aggr_sel->set_agg_func_used(true); update_used_tables(); thd->lex->in_sum_func= in_sum_func; return FALSE; |