diff options
| author | hery.ramilison@oracle.com <> | 2011-07-06 01:13:50 +0200 |
|---|---|---|
| committer | MySQL Release Engineering <mysql-re_ww@oracle.com> | 2011-07-06 01:13:50 +0200 |
| commit | c74d844de30136c570c3bca089d1f2949d00603c (patch) | |
| tree | 31e14059cf5a1e5e8c1601a2488b98c4af1bfeb0 /sql/item_sum.cc | |
| parent | 3b69f27e59909e67fed27c4d728b96483188a663 (diff) | |
| parent | 1c810152963f770fae011b29ae30fbafbc516b23 (diff) | |
| download | mariadb-git-c74d844de30136c570c3bca089d1f2949d00603c.tar.gz | |
Merge from mysql-5.5.14-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 4fe871b9a4e..161c8c8eacf 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; |