database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge

Browse Source 
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2003-07-07 18:49:54 +03:00
parent 2cd6d8ec6b 8d128eed80
commit 134cc54e80
4 changed files with 82 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.h
View File

@ -140,12 +140,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
@ -212,7 +214,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;