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 | e257fb3319ea6919de0a3c74c7025d4f9a218fed (patch) | |
| tree | 4b2a82480afbf07a0e4ba4447dbf4f3a51761bbe /sql/item_sum.cc | |
| parent | b96d97fd7f25ad7570688cf38b10b4b77a648871 (diff) | |
| parent | 1cf483aa588cf47383af49db6d7304b911ee92db (diff) | |
| download | mariadb-git-e257fb3319ea6919de0a3c74c7025d4f9a218fed.tar.gz | |
merge 5.0 => 5.1 : Bug#12329653
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 2a8aea68f7a..f177c98bf65 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; |