diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-05-17 10:05:07 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-05-17 10:05:07 +0300 |
| commit | acda3d79b6f16441375171dfc58a78b85d313eff (patch) | |
| tree | c9fa69ab2da8ee1dc3cc3ea759cd3fa02bef9aca /sql/sql_derived.cc | |
| parent | ddabd51c5738bf3bd9f0f40d7368bd3eee92e966 (diff) | |
| download | mariadb-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_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 7f555f37d40..4ede6462058 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -125,7 +125,7 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, item_list= select_cursor->item_list; select_cursor->with_wild= 0; if (setup_ref_array(thd, &select_cursor->ref_pointer_array, - (item_list.elements + select_cursor->with_sum_func + + (item_list.elements + select_cursor->select_items + select_cursor->order_list.elements + select_cursor->group_list.elements)) || setup_fields(thd, select_cursor->ref_pointer_array, first_table, item_list, |