diff options
| author | kostja@bodhi.local <> | 2007-03-07 13:02:14 +0300 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2007-03-07 13:02:14 +0300 |
| commit | ae97896111debd253aabd82ad3952a0ab7dc7455 (patch) | |
| tree | b2b9f20bb9930dd07a7e5423a01621996d366ab3 /sql/sql_trigger.cc | |
| parent | e648fb17922548e75d9b3e7aba5f886abf0457a3 (diff) | |
| parent | c2e0e5af096d183c0adb166ae11dd9039b2d145b (diff) | |
| download | mariadb-git-ae97896111debd253aabd82ad3952a0ab7dc7455.tar.gz | |
Merge bodhi.local:/opt/local/work/mysql-5.0-26750
into bodhi.local:/opt/local/work/mysql-5.1-runtime
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 5c61f172ecd..c8680aecd50 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -981,11 +981,8 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, thd->spcont= 0; if (MYSQLparse((void *)thd) || thd->is_fatal_error) { - /* - Free lex associated resources. - QQ: Do we really need all this stuff here ? - */ - delete lex.sphead; + /* Currently sphead is always deleted in case of a parse error */ + DBUG_ASSERT(lex.sphead == 0); goto err_with_lex_cleanup; } |