summaryrefslogtreecommitdiff
path: root/sql/item.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/item.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/item.cc')
-rw-r--r--sql/item.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 053a94cb695..0a885edec2a 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -46,6 +46,8 @@ Item::Item():
next= thd->free_list; // Put in free list
thd->free_list= this;
loop_id= 0;
+ if (thd->lex.current_select->parsing_place == SELECT_LEX_NODE::SELECT_LIST)
+ thd->lex.current_select->select_items++;
}
/*