summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2010-08-09 13:00:58 +0300
committerunknown <sanja@askmonty.org>2010-08-09 13:00:58 +0300
commit4cf6b18b03ffa4ca95486f0274b3692873c3901e (patch)
tree29877cf655c45d8f46d8b9f6488e5cdcdb902561 /sql/sql_class.h
parent26148735a00d6ce6445d44123e7a2156c55f4729 (diff)
downloadmariadb-git-4cf6b18b03ffa4ca95486f0274b3692873c3901e.tar.gz
Fix for LP bug#611625: Removing NULL references from subquery parameter list added.
Incorrect limitation on number of parameters removed. mysql-test/r/subselect_cache.result: Test suite added. mysql-test/t/subselect_cache.test: Test suite added. sql/sql_class.h: Iterator changed. sql/sql_expression_cache.cc: Incorrect limitation removed. Removing NULL references from subquery parameter list added.
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 53f03de5efc..bf84d12cc58 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -62,9 +62,9 @@ public:
class Item_iterator_ref_list: public Item_iterator
{
- List_iterator_fast<Item*> list;
+ List_iterator<Item*> list;
public:
- Item_iterator_ref_list(List_iterator_fast<Item*> &arg_list):
+ Item_iterator_ref_list(List_iterator<Item*> &arg_list):
list(arg_list) {}
void open() { list.rewind(); }
Item *next() { return *(list++); }