diff options
| author | unknown <pem@mysql.comhem.se> | 2003-12-20 15:43:24 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2003-12-20 15:43:24 +0100 |
| commit | 3fa541df60f828f66a88f2c7e37db66859f90e08 (patch) | |
| tree | dead461158f22d73f199c92f8d6fa95f26b9cdd3 /sql/sql_prepare.cc | |
| parent | 495082a6c97603547c1eda4c1d99e65787dad5a4 (diff) | |
| download | mariadb-git-3fa541df60f828f66a88f2c7e37db66859f90e08.tar.gz | |
Post-merge fixes.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 59812991b73..736eb39b37c 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -937,6 +937,13 @@ bool mysql_stmt_prepare(THD *thd, char *packet, uint packet_length) DBUG_RETURN(0); yyparse_err: + if (thd->lex->sphead) + { + if (lex != thd->lex) + thd->lex->sphead->restore_lex(thd); + delete thd->lex->sphead; + thd->lex->sphead= NULL; + } lex_end(lex); stmt->set_statement(thd); thd->set_statement(&thd->stmt_backup); |