mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Update VC++ files
Portability fixes After merge fixes VC++Files/mysql.dsw: Added dependencys VC++Files/mysys/mysys.dsp: Add missing files client/mysqlcheck.c: Added comment client/mysqltest.c: Remove not used variables include/keycache.h: Removed not used element include/m_ctype.h: Portability fix include/my_base.h: Removed not used define myisam/mi_keycache.c: Added mutex for extra safety mysql-test/r/count_distinct3.result: Faster test mysql-test/r/rpl_change_master.result: updated results mysql-test/t/count_distinct3.test: Faster test mysql-test/t/rpl_change_master.test: Make test repeatable mysys/default.c: Remove compiler warning mysys/mf_keycache.c: Removed not used 'action' element mysys/my_getopt.c: Remove not used variable sql/ha_myisam.cc: Remove compiler warning sql/item.cc: Fixed wrong patch from last changeset sql/item_timefunc.cc: Remove compiler warnings sql/set_var.cc: Remove compiler warnings sql/sql_prepare.cc: Remove not used variables sql/sql_repl.cc: After merge fix sql/sql_select.h: Added comments sql/sql_table.cc: Remove not used define strings/ctype-tis620.c: Remove not used variables
This commit is contained in:
@ -166,11 +166,23 @@ class JOIN :public Sql_alloc
|
||||
JOIN *tmp_join; // copy of this JOIN to be used with temporary tables
|
||||
ROLLUP rollup; // Used with rollup
|
||||
|
||||
bool select_distinct, //Is select distinct?
|
||||
no_order, simple_order, simple_group,
|
||||
skip_sort_order, need_tmp,
|
||||
hidden_group_fields,
|
||||
buffer_result;
|
||||
bool select_distinct; // Set if SELECT DISTINCT
|
||||
|
||||
/*
|
||||
simple_xxxxx is set if ORDER/GROUP BY doesn't include any references
|
||||
to other tables than the first non-constant table in the JOIN.
|
||||
It's also set if ORDER/GROUP BY is empty.
|
||||
*/
|
||||
bool simple_order, simple_group;
|
||||
/*
|
||||
Is set only in case if we have a GROUP BY clause
|
||||
and no ORDER BY after constant elimination of 'order'.
|
||||
*/
|
||||
bool no_order;
|
||||
/* Is set if we have a GROUP BY and we have ORDER BY on a constant. */
|
||||
bool skip_sort_order;
|
||||
|
||||
bool need_tmp, hidden_group_fields, buffer_result;
|
||||
DYNAMIC_ARRAY keyuse;
|
||||
Item::cond_result cond_value;
|
||||
List<Item> all_fields; // to store all fields that used in query
|
||||
|
Reference in New Issue
Block a user