diff options
| author | unknown <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 | 7d605ec45f8e55e1775fd028931c459e6501d25a (patch) | |
| tree | 31e14059cf5a1e5e8c1601a2488b98c4af1bfeb0 /sql/item.cc | |
| parent | 8f73e64fff57fe4080cfc4d2816555b0d22b9e13 (diff) | |
| parent | 8b1566aaaf93e6e885badd6500a07a0f70cc81f3 (diff) | |
| download | mariadb-git-7d605ec45f8e55e1775fd028931c459e6501d25a.tar.gz | |
Merge from mysql-5.5.14-release
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 6d86c84d37c..ca1ae1c4f71 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4821,14 +4821,14 @@ mark_non_agg_field: SELECT_LEX *select_lex= cached_table ? cached_table->select_lex : context->select_lex; if (!thd->lex->in_sum_func) - select_lex->full_group_by_flag|= NON_AGG_FIELD_USED; + select_lex->set_non_agg_field_used(true); else { if (outer_fixed) thd->lex->in_sum_func->outer_fields.push_back(this); else if (thd->lex->in_sum_func->nest_level != thd->lex->current_select->nest_level) - select_lex->full_group_by_flag|= NON_AGG_FIELD_USED; + select_lex->set_non_agg_field_used(true); } } return FALSE; |