summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-05-17 10:05:07 +0300
committerunknown <bell@sanja.is.com.ua>2003-05-17 10:05:07 +0300
commitacda3d79b6f16441375171dfc58a78b85d313eff (patch)
treec9fa69ab2da8ee1dc3cc3ea759cd3fa02bef9aca /sql/sql_select.cc
parentddabd51c5738bf3bd9f0f40d7368bd3eee92e966 (diff)
downloadmariadb-git-acda3d79b6f16441375171dfc58a78b85d313eff.tar.gz
fixed memory overrun (bug 380)
mysql-test/r/func_group.result: new tests mysql-test/t/func_group.test: new tests sql/item.cc: count items in select list sql/item_subselect.cc: use number of item in select list for array creation sql/item_sum.cc: with_sum_func now is boolean sql/sql_derived.cc: use number of item in select list for array creation sql/sql_lex.cc: create_refs changed with parsing_place enum variable sql/sql_lex.h: added items in select list counter create_refs changed with parsing_place enum variable with_sum_func now is boolean sql/sql_select.cc: use number of item in select list for array creation sql/sql_union.cc: use number of item in select list for array creation sql/sql_yacc.yy: create_refs changed with parsing_place enum variable
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 85ebb9f207f..bee41cee346 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -289,7 +289,7 @@ JOIN::prepare(Item ***rref_pointer_array,
fields_list,
&all_fields, wild_num))) ||
setup_ref_array(thd, rref_pointer_array, (fields_list.elements +
- select_lex->with_sum_func +
+ select_lex->select_items +
og_num)) ||
setup_fields(thd, (*rref_pointer_array), tables_list, fields_list, 1,
&all_fields, 1) ||