summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-05-22 21:31:36 -0700
committerIgor Babaev <igor@askmonty.org>2012-05-22 21:31:36 -0700
commitbf770c505e3ab25fee75e9b74656ee240acd81cf (patch)
tree7872d2ed27140a92e26479641ac360511cb70ab8 /sql/sql_lex.cc
parent44f5c1a886e3e368827fbef764896a397c313e4a (diff)
parent055477ae522b805d3b2e890af9fe520cc1e3290d (diff)
downloadmariadb-git-bf770c505e3ab25fee75e9b74656ee240acd81cf.tar.gz
Merge.
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 6fd6e53424f..d7340b67b5a 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -456,6 +456,8 @@ void lex_start(THD *thd)
lex->set_var_list.empty();
lex->param_list.empty();
lex->view_list.empty();
+ lex->column_list= NULL;
+ lex->index_list= NULL;
lex->prepared_stmt_params.empty();
lex->auxiliary_table_list.empty();
lex->unit.next= lex->unit.master=