diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-01-16 18:36:50 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-01-16 18:36:50 +0200 |
| commit | 3c9170ed17d58d7b402176da52439720602f05b0 (patch) | |
| tree | 573220af778f4845a6dd3138f695e414be74c42d /sql/sql_lex.cc | |
| parent | 3c45559db8e6185afcf0c19cb493bebf4e444b5a (diff) | |
| parent | 7f586778f33c9393c26c5c38e224a83d5e1837c6 (diff) | |
| download | mariadb-git-3c9170ed17d58d7b402176da52439720602f05b0.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
sql/sql_lex.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 5730073bd35..55f8b82c3ca 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -164,7 +164,10 @@ 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); } |