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 | 9baf84e99a6d7edd36c777593a90671d02aacbc9 (patch) | |
| tree | 4b2a82480afbf07a0e4ba4447dbf4f3a51761bbe /sql/item.cc | |
| parent | c00c350f147173bf20c35c8787cdf0d840653e96 (diff) | |
| parent | a32df762d43c29545718e8a78a1721a9a7a1a35f (diff) | |
| download | mariadb-git-9baf84e99a6d7edd36c777593a90671d02aacbc9.tar.gz | |
merge 5.0 => 5.1 : Bug#12329653
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 40be8b205bd..d569f2b2080 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4464,14 +4464,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; |