diff options
| author | unknown <dlenev@mysql.com> | 2004-09-08 13:29:21 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-09-08 13:29:21 +0400 |
| commit | cab6f8df6ddb35fbdef771eb56217bb0920be25b (patch) | |
| tree | a103ef36c1230a085165269c481e5e135b27550d /sql/sql_delete.cc | |
| parent | 9243aa9ebe800724497316a8eb1bbab1d1065db6 (diff) | |
| parent | 52ac4935e7e00218bf7abde7b841a2e5111cc819 (diff) | |
| download | mariadb-git-cab6f8df6ddb35fbdef771eb56217bb0920be25b.tar.gz | |
Merge of changes from the main tree to tree for WL#1218 "Triggers".
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/parse_file.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
include/mysqld_error.h:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/share/czech/errmsg.txt:
Manual merge.
sql/share/danish/errmsg.txt:
Manual merge.
sql/share/dutch/errmsg.txt:
Manual merge.
sql/share/english/errmsg.txt:
Manual merge.
sql/share/estonian/errmsg.txt:
Manual merge.
sql/share/french/errmsg.txt:
Manual merge.
sql/share/german/errmsg.txt:
Manual merge.
sql/share/greek/errmsg.txt:
Manual merge.
sql/share/hungarian/errmsg.txt:
Manual merge.
sql/share/italian/errmsg.txt:
Manual merge.
sql/share/japanese/errmsg.txt:
Manual merge.
sql/share/korean/errmsg.txt:
Manual merge.
sql/share/norwegian-ny/errmsg.txt:
Manual merge.
sql/share/norwegian/errmsg.txt:
Manual merge.
sql/share/polish/errmsg.txt:
Manual merge.
sql/share/portuguese/errmsg.txt:
Manual merge.
sql/share/romanian/errmsg.txt:
Manual merge.
sql/share/russian/errmsg.txt:
Manual merge.
sql/share/serbian/errmsg.txt:
Manual merge.
sql/share/slovak/errmsg.txt:
Manual merge.
sql/share/spanish/errmsg.txt:
Manual merge.
sql/share/swedish/errmsg.txt:
Manual merge.
sql/share/ukrainian/errmsg.txt:
Manual merge.
sql/sp_head.cc:
Manual merge.
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 |