From 1026028faf0240dfec36117bf41e2bfa4983cda9 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 30 May 2003 22:14:52 +0300 Subject: priventing allocation unused Item_buff (alloc_group_fields()) mysql-test/r/subselect.result: new test for code coverage mysql-test/t/subselect.test: new test for code coverage sql/sql_select.cc: priventing allocation unused Item_buff sql/sql_select.h: priventing allocation unused Item_buff --- sql/sql_select.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_select.h') diff --git a/sql/sql_select.h b/sql/sql_select.h index 7f3669f7478..1e0f7314e7c 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -127,7 +127,7 @@ class JOIN :public Sql_alloc POSITION positions[MAX_TABLES+1],best_positions[MAX_TABLES+1]; double best_read; List *fields; - List group_fields; + List group_fields, group_fields_cache; TABLE *tmp_table; // used to store 2 possible tmp table of SELECT TABLE *exec_tmp_table1, *exec_tmp_table2; -- cgit v1.2.1 From 9277fde737fcc24359d27dec4eafcb19bbfa3265 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 7 Jul 2003 00:45:51 +0300 Subject: fixed subselect with to temporary tables executing (now it return correct results. Test was commited before, but it is not pushed, BUG# is not registered, because bug was introduced after release) sql/sql_select.cc: fixed subselect with to temporary tables executing sql/sql_select.h: fixed subselect with to temporary tables executing --- sql/sql_select.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sql/sql_select.h') diff --git a/sql/sql_select.h b/sql/sql_select.h index aa08c5c1725..7de9007369e 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -146,6 +146,8 @@ class JOIN :public Sql_alloc 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 @@ -199,7 +201,7 @@ class JOIN :public Sql_alloc send_records(0), found_records(0), examined_rows(0), exec_tmp_table1(0), exec_tmp_table2(0), thd(thd_arg), - sum_funcs(0), + sum_funcs(0),sum_funcs2(0), procedure(0), having(0), tmp_having(0), select_options(select_options_arg), -- cgit v1.2.1