diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-07-07 18:51:14 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-07-07 18:51:14 +0300 |
| commit | 21afeb48dab3b9dfe50fafc9f6139608549278ba (patch) | |
| tree | 40138499ec9c47eb90d2e08ed5b51cfdf783125f /sql/sql_select.h | |
| parent | 0383e793abc2509e26d578c7cff6aee4ad5f8715 (diff) | |
| parent | 07dc27a3c80854c51754e5f714af3c6cad1339bc (diff) | |
| download | mariadb-git-21afeb48dab3b9dfe50fafc9f6139608549278ba.tar.gz | |
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
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
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 57f60d93130..abfde528746 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -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; |