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/item_sum.cc | |
| parent | e889b48749583751895b8f34e1906c93f69d53f0 (diff) | |
| parent | 9baf84e99a6d7edd36c777593a90671d02aacbc9 (diff) | |
| download | mariadb-git-294fb44d67ff1b12e11b7f771d5260ed2b1b97fb.tar.gz | |
merge 5.1 => 5.5 : 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 8855ef05c84..42088616f4a 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -259,10 +259,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, @@ -271,7 +271,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; |