diff options
| author | unknown <davi@endora.local> | 2008-02-19 10:39:14 -0300 |
|---|---|---|
| committer | unknown <davi@endora.local> | 2008-02-19 10:39:14 -0300 |
| commit | 1b8bba3063186b49aae493ba8d35c4bcfa77f5e3 (patch) | |
| tree | 1baf35789f604117346718db60e6631e8bf380af /sql/sql_update.cc | |
| parent | d344dbe978a822937b2c4b23689b5bb266d96cf7 (diff) | |
| parent | 38455a40fb77cb34552a0f9af2ab4165b8b5793d (diff) | |
| download | mariadb-git-1b8bba3063186b49aae493ba8d35c4bcfa77f5e3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 61df6b0b871..7c9ead7591c 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -643,14 +643,6 @@ int mysql_update(THD *thd, updated++; else error= 0; - - if (table->triggers && - table->triggers->process_triggers(thd, TRG_EVENT_UPDATE, - TRG_ACTION_AFTER, TRUE)) - { - error= 1; - break; - } } else if (!ignore || table->file->is_fatal_error(error, HA_CHECK_DUP_KEY)) @@ -669,6 +661,14 @@ int mysql_update(THD *thd, } } + if (table->triggers && + table->triggers->process_triggers(thd, TRG_EVENT_UPDATE, + TRG_ACTION_AFTER, TRUE)) + { + error= 1; + break; + } + if (!--limit && using_limit) { /* @@ -1633,12 +1633,12 @@ bool multi_update::send_data(List<Item> ¬_used_values) trans_safe= 0; thd->transaction.stmt.modified_non_trans_table= TRUE; } - if (table->triggers && - table->triggers->process_triggers(thd, TRG_EVENT_UPDATE, - TRG_ACTION_AFTER, TRUE)) - DBUG_RETURN(1); } } + if (table->triggers && + table->triggers->process_triggers(thd, TRG_EVENT_UPDATE, + TRG_ACTION_AFTER, TRUE)) + DBUG_RETURN(1); } else { @@ -1860,12 +1860,12 @@ int multi_update::do_updates() updated++; else local_error= 0; - - if (table->triggers && - table->triggers->process_triggers(thd, TRG_EVENT_UPDATE, - TRG_ACTION_AFTER, TRUE)) - goto err2; } + + if (table->triggers && + table->triggers->process_triggers(thd, TRG_EVENT_UPDATE, + TRG_ACTION_AFTER, TRUE)) + goto err2; } if (updated != org_updated) |