diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-03-08 00:02:41 +0100 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-03-08 00:02:41 +0100 |
| commit | e7362d5c32e4c8dc606021bc061da31e02167127 (patch) | |
| tree | 2ce64e9d56f5de3dddd59bd4ad2f070e65b8a880 /sql/sql_trigger.cc | |
| parent | 9baec3334095fba0fcd1bf571efdc7ccc0692300 (diff) | |
| parent | d203b18ee46024cf5674a494b559786f15568295 (diff) | |
| download | mariadb-git-e7362d5c32e4c8dc606021bc061da31e02167127.tar.gz | |
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
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 1e59a12bdc9..311bd089c64 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; } |