diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-07-07 18:49:54 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-07-07 18:49:54 +0300 |
| commit | 134cc54e80bef8e1dcd344fe332000f39018682b (patch) | |
| tree | 2e267c53be09d1c74e99b7e25d105ae7ad9d0165 /sql/sql_select.h | |
| parent | 2cd6d8ec6bd7a4a04a0b19943da0f331df25cf0f (diff) | |
| parent | 8d128eed802e47fbce895a1f7d46caf56ac4a50e (diff) | |
| download | mariadb-git-134cc54e80bef8e1dcd344fe332000f39018682b.tar.gz | |
merge
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index a4554183312..40a097c10ad 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -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; |