diff options
author | dlenev@brandersnatch.localdomain <> | 2005-03-05 16:31:58 +0300 |
---|---|---|
committer | dlenev@brandersnatch.localdomain <> | 2005-03-05 16:31:58 +0300 |
commit | e6a506c3973decf7c5dcb2393dfea1d2194633eb (patch) | |
tree | c5edb86c94bf138a7049952573b7f5752324da7a /sql/sql_trigger.cc | |
parent | c24820834a65223343961dd8b92c8e5e9c0ea95d (diff) | |
download | mariadb-git-e6a506c3973decf7c5dcb2393dfea1d2194633eb.tar.gz |
Fix for yet another memleak caused by SP-locking patch.
Improved handling of situations when we encounter error during
CREATE PROCEDURE (FUNCTION/TRIGGER/...) and bail out of yyparse()
without restoring proper THD::lex.
Diffstat (limited to 'sql/sql_trigger.cc')
-rw-r--r-- | sql/sql_trigger.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index f61ff12f365..110841e8fd4 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -415,9 +415,8 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, */ if (lex.sphead) { - if (&lex != thd->lex) - thd->lex->sphead->restore_lex(thd); delete lex.sphead; + lex.sphead= 0; } goto err_with_lex_cleanup; } |