diff options
| author | evgen@moonbone.local <> | 2007-03-20 01:29:09 +0300 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2007-03-20 01:29:09 +0300 |
| commit | 37add3b6613c0bf9b0748373d65b88735bcaf2ed (patch) | |
| tree | ece1e13959d1fc43f206693dd5f3c68ab334ccd5 /sql/sql_insert.cc | |
| parent | cb89159eb13c9565b588b51c81d5e72d2208bc87 (diff) | |
| parent | 31b9145ab3de8813a10937f0894d3e127e78533c (diff) | |
| download | mariadb-git-37add3b6613c0bf9b0748373d65b88735bcaf2ed.tar.gz | |
Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 52f3fd507e4..242ae16a5d3 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1262,6 +1262,10 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) compare_record(table)) { info->updated++; + trg_error= (table->triggers && + table->triggers->process_triggers(thd, TRG_EVENT_UPDATE, + TRG_ACTION_AFTER, + TRUE)); info->copied++; } /* @@ -1278,6 +1282,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) trg_error= (table->triggers && table->triggers->process_triggers(thd, TRG_EVENT_UPDATE, TRG_ACTION_AFTER, TRUE)); + goto ok_or_after_trg_err; } else /* DUP_REPLACE */ |