diff options
| author | Sunanda Menon <sunanda.menon@oracle.com> | 2011-07-06 11:36:39 +0200 |
|---|---|---|
| committer | Sunanda Menon <sunanda.menon@oracle.com> | 2011-07-06 11:36:39 +0200 |
| commit | af6ddeca48227198e420e3e3704a856d013c7ec7 (patch) | |
| tree | b620a0de6d93498520da98a4e463693e72de646f /sql/item.cc | |
| parent | bb3723835e3b141cc835ea9f2eb3cbf069855104 (diff) | |
| parent | 51e1713a5d5d968d922612141eec3208c086d878 (diff) | |
| download | mariadb-git-af6ddeca48227198e420e3e3704a856d013c7ec7.tar.gz | |
Merge from mysql-5.0.94-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 b7152710871..ad73a5d6f5a 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4081,14 +4081,14 @@ mark_non_agg_field: aggregated or not. */ if (!thd->lex->in_sum_func) - cached_table->select_lex->full_group_by_flag|= NON_AGG_FIELD_USED; + cached_table->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) - cached_table->select_lex->full_group_by_flag|= NON_AGG_FIELD_USED; + cached_table->select_lex->set_non_agg_field_used(true); } } return FALSE; |