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/sql_lex.h | |
parent | 3b69f27e59909e67fed27c4d728b96483188a663 (diff) | |
parent | 1c810152963f770fae011b29ae30fbafbc516b23 (diff) | |
download | mariadb-git-c74d844de30136c570c3bca089d1f2949d00603c.tar.gz |
Merge from mysql-5.5.14-release
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index a288960d2d2..accbd78246e 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -800,16 +800,7 @@ public: joins on the right. */ List<String> *prev_join_using; - /* - Bitmap used in the ONLY_FULL_GROUP_BY_MODE to prevent mixture of aggregate - functions and non aggregated fields when GROUP BY list is absent. - Bits: - 0 - non aggregated fields are used in this select, - defined as NON_AGG_FIELD_USED. - 1 - aggregate functions are used in this select, - defined as SUM_FUNC_USED. - */ - uint8 full_group_by_flag; + void init_query(); void init_select(); st_select_lex_unit* master_unit(); @@ -918,7 +909,22 @@ public: void clear_index_hints(void) { index_hints= NULL; } -private: + /* + For MODE_ONLY_FULL_GROUP_BY we need to maintain two flags: + - Non-aggregated fields are used in this select. + - Aggregate functions are used in this select. + In MODE_ONLY_FULL_GROUP_BY only one of these may be true. + */ + bool non_agg_field_used() const { return m_non_agg_field_used; } + bool agg_func_used() const { return m_agg_func_used; } + + void set_non_agg_field_used(bool val) { m_non_agg_field_used= val; } + void set_agg_func_used(bool val) { m_agg_func_used= val; } + +private: + bool m_non_agg_field_used; + bool m_agg_func_used; + /* current index hint kind. used in filling up index_hints */ enum index_hint_type current_index_hint_type; index_clause_map current_index_hint_clause; |