From dd56d63f4892c80178153483fda8172d9733de12 Mon Sep 17 00:00:00 2001
From: "bell@sanja.is.com.ua" <>
Date: Tue, 11 Jan 2005 11:53:39 +0200
Subject: [PATCH 1/2] error of parsing can occur in any SELECT, so all SELECTs
 have to be checked

---
 sql/sql_lex.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index d2ac0df1472..f5a0fef6769 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -163,7 +163,8 @@ void lex_start(THD *thd, uchar *buf,uint length)
 
 void lex_end(LEX *lex)
 {
-  lex->select_lex.expr_list.delete_elements();	// If error when parsing sql-varargs
+  for(SELECT_LEX *sl= lex->all_selects_list; sl; sl= sl->next_select_in_list())
+    sl->expr_list.delete_elements();	// If error when parsing sql-varargs
   x_free(lex->yacc_yyss);
   x_free(lex->yacc_yyvs);
 }

From 2ca7c0062f826314af030662a48eb8c55b55a64e Mon Sep 17 00:00:00 2001
From: "bell@sanja.is.com.ua" <>
Date: Sun, 16 Jan 2005 18:36:13 +0200
Subject: [PATCH 2/2] postreview changes

---
 sql/sql_lex.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index f5a0fef6769..e3137bf3766 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -163,7 +163,9 @@ void lex_start(THD *thd, uchar *buf,uint length)
 
 void lex_end(LEX *lex)
 {
-  for(SELECT_LEX *sl= lex->all_selects_list; sl; sl= sl->next_select_in_list())
+  for (SELECT_LEX *sl= lex->all_selects_list;
+       sl;
+       sl= sl->next_select_in_list())
     sl->expr_list.delete_elements();	// If error when parsing sql-varargs
   x_free(lex->yacc_yyss);
   x_free(lex->yacc_yyvs);