mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
This commit is contained in:
@ -141,12 +141,14 @@ class JOIN :public Sql_alloc
|
||||
POSITION positions[MAX_TABLES+1],best_positions[MAX_TABLES+1];
|
||||
double best_read;
|
||||
List<Item> *fields;
|
||||
List<Item_buff> group_fields;
|
||||
List<Item_buff> group_fields, group_fields_cache;
|
||||
TABLE *tmp_table;
|
||||
// used to store 2 possible tmp table of SELECT
|
||||
TABLE *exec_tmp_table1, *exec_tmp_table2;
|
||||
THD *thd;
|
||||
Item_sum **sum_funcs, ***sum_funcs_end;
|
||||
/* second copy of sumfuncs (for queries with 2 temporary tables */
|
||||
Item_sum **sum_funcs2, ***sum_funcs_end2;
|
||||
Procedure *procedure;
|
||||
Item *having;
|
||||
Item *tmp_having; // To store Having when processed temporary table
|
||||
@ -213,7 +215,7 @@ class JOIN :public Sql_alloc
|
||||
exec_tmp_table1= 0;
|
||||
exec_tmp_table2= 0;
|
||||
thd= thd_arg;
|
||||
sum_funcs= 0;
|
||||
sum_funcs= sum_funcs2= 0;
|
||||
procedure= 0;
|
||||
having= 0;
|
||||
tmp_having= 0;
|
||||
|
Reference in New Issue
Block a user