diff options
| author | unknown <kostja@bodhi.local> | 2007-03-07 12:28:16 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2007-03-07 12:28:16 +0300 |
| commit | 7f69b747d091ef3ca5c2e31b3befd8dd02fbf790 (patch) | |
| tree | 1249811d57e93e6711457da61be9ec118f88343e /sql/sql_trigger.cc | |
| parent | f7414b28971e89bb7a8df03835b5ab250c8e24ee (diff) | |
| parent | 053c6c01d62707fa6189d411fdaf1040b948f9e5 (diff) | |
| download | mariadb-git-7f69b747d091ef3ca5c2e31b3befd8dd02fbf790.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into bodhi.local:/opt/local/work/mysql-5.0-26750
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_class.h:
Manual merge.
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 42a361cc464..55d51ad07b7 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -983,11 +983,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; } |