diff options
| author | unknown <evgen@moonbone.local> | 2008-03-28 18:09:14 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2008-03-28 18:09:14 +0300 |
| commit | fbbb60ce2f35b93a21229d585b7a27d7c5c50adc (patch) | |
| tree | 31732e6de3b8d61202db7baddd0a4627816a31ae /sql/item_sum.h | |
| parent | 9d0385d62bfb439855ec8de027776ef847f47369 (diff) | |
| parent | 7c156537cc51c42ae58c61f6bb70a307b8216334 (diff) | |
| download | mariadb-git-fbbb60ce2f35b93a21229d585b7a27d7c5c50adc.tar.gz | |
Merge moonbone.local:/work/27219-5.0-opt-mysql
into moonbone.local:/work/27219-bug-5.1
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/group_by.result:
SCCS merged
mysql-test/t/group_by.test:
SCCS merged
sql/item.cc:
SCCS merged
sql/sql_lex.h:
SCCS merged
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index d1e6a74e85e..bee8792fbfa 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -239,6 +239,13 @@ public: int8 max_arg_level; /* max level of unbound column references */ int8 max_sum_func_level;/* max level of aggregation for embedded functions */ bool quick_group; /* If incremental update of fields */ + /* + This list is used by the check for mixing non aggregated fields and + sum functions in the ONLY_FULL_GROUP_BY_MODE. We save all outer fields + directly or indirectly used under this function it as it's unclear + at the moment of fixing outer field whether it's aggregated or not. + */ + List<Item_field> outer_fields; protected: table_map used_tables_cache; |