diff options
| author | dlenev@mysql.com <> | 2004-09-08 13:29:21 +0400 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2004-09-08 13:29:21 +0400 |
| commit | 9b1bc6a4d59267becd668e13e94985bb551119b0 (patch) | |
| tree | a103ef36c1230a085165269c481e5e135b27550d /sql/sql_delete.cc | |
| parent | 2e38c0bf38bf735bb113f6194b841895350caac9 (diff) | |
| parent | 9ed038dd6f788e18154c299c07ba5c88446fd638 (diff) | |
| download | mariadb-git-9b1bc6a4d59267becd668e13e94985bb551119b0.tar.gz | |
Merge of changes from the main tree to tree for WL#1218 "Triggers".
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 089c0c00c3b..587cb28bcb1 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -26,6 +26,8 @@ #include "mysql_priv.h" #include "ha_innodb.h" #include "sql_select.h" +#include "sp_head.h" +#include "sql_trigger.h" int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_LIST *order, ha_rows limit, ulong options) @@ -160,6 +162,11 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_LIST *order, // thd->net.report_error is tested to disallow delete row on error if (!(select && select->skip_record())&& !thd->net.report_error ) { + + if (table->triggers) + table->triggers->process_triggers(thd, TRG_EVENT_DELETE, + TRG_ACTION_BEFORE); + if (!(error=table->file->delete_row(table->record[0]))) { deleted++; @@ -183,6 +190,10 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_LIST *order, error= 1; break; } + + if (table->triggers) + table->triggers->process_triggers(thd, TRG_EVENT_DELETE, + TRG_ACTION_AFTER); } else table->file->unlock_row(); // Row failed selection, release lock on it |