mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge mysql.com:/home/hf/work/29717/my41-29717
into mysql.com:/home/hf/work/29717/my50-29717 mysql-test/t/insert_select.test: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/group_by.result: merging mysql-test/r/insert_select.result: merging mysql-test/t/group_by.test: merging sql/sql_select.h: merging
This commit is contained in:
@@ -282,6 +282,14 @@ public:
|
||||
ROLLUP rollup; // Used with rollup
|
||||
|
||||
bool select_distinct; // Set if SELECT DISTINCT
|
||||
/*
|
||||
If we have the GROUP BY statement in the query,
|
||||
but the group_list was emptied by optimizer, this
|
||||
flag is TRUE.
|
||||
It happens when fields in the GROUP BY are from
|
||||
constant table
|
||||
*/
|
||||
bool group_optimized_away;
|
||||
|
||||
/*
|
||||
simple_xxxxx is set if ORDER/GROUP BY doesn't include any references
|
||||
@@ -390,6 +398,7 @@ public:
|
||||
zero_result_cause= 0;
|
||||
optimized= 0;
|
||||
cond_equal= 0;
|
||||
group_optimized_away= 0;
|
||||
|
||||
all_fields= fields_arg;
|
||||
fields_list= fields_arg;
|
||||
|
Reference in New Issue
Block a user