summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2014-11-27 00:51:54 +0300
committerSergei Petrunia <psergey@askmonty.org>2014-11-27 00:51:54 +0300
commit3d5f97fd708e12201636179baee2c8bc0093c109 (patch)
tree04a2ea21f8312ecc4100e179f32ce58e719e82fb /sql/sql_select.h
parent55e99b29339dae833448ded6d0ca3d31f673d02a (diff)
parent3c5ce8a0a32a74cd8e0ddc81bcfacf7c85f0d90a (diff)
downloadmariadb-git-3d5f97fd708e12201636179baee2c8bc0093c109.tar.gz
Merge ../10.1-explain-json-r4 into 10.1
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index ca2bf59d871..ac1ea05a498 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -982,7 +982,13 @@ public:
*/
uint top_join_tab_count;
uint send_group_parts;
- bool group; /**< If query contains GROUP BY clause */
+ /*
+ True if the query has GROUP BY.
+ (that is, if group_by != NULL. when DISTINCT is converted into GROUP BY, it
+ will set this, too. It is not clear why we need a separate var from
+ group_list)
+ */
+ bool group;
bool need_distinct;
/**
@@ -1914,4 +1920,5 @@ ulong check_selectivity(THD *thd,
TABLE *table,
List<COND_STATISTIC> *conds);
+
#endif /* SQL_SELECT_INCLUDED */