summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2012-10-01 15:57:37 +0200
committerTor Didriksen <tor.didriksen@oracle.com>2012-10-01 15:57:37 +0200
commitc25571b08dea5cff9b8564a34462cc4a54f08a49 (patch)
tree1a5c359112d826b75c8b23840fd1ffb8293398dc /sql/sql_lex.cc
parent3cabd3b9f6ab0130cae834cdd3af6b0ca40735a4 (diff)
parent4d29767e6c57198eb4650421f730701b4dd4d2d7 (diff)
downloadmariadb-git-c25571b08dea5cff9b8564a34462cc4a54f08a49.tar.gz
merge 5.1 => 5.5
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 1d7438503f1..bf0982efddd 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1760,6 +1760,7 @@ void st_select_lex::init_query()
ref_pointer_array= 0;
select_n_where_fields= 0;
select_n_having_items= 0;
+ n_child_sum_items= 0;
subquery_in_having= explicit_limit= 0;
is_item_list_lookup= 0;
first_execution= 1;