database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

sql_insert.cc:

Browse Source 
After merge fix.
This commit is contained in:
evgen@moonbone.local
2007-03-20 01:37:33 +03:00
parent 37add3b661
commit 41c732493e
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_insert.cc
View File

@ -1262,12 +1262,6 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
compare_record(table)) compare_record(table))
{ {
info->updated++; info->updated++;
trg_error= (table->triggers &&
table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,
TRG_ACTION_AFTER,
TRUE));
info->copied++;
}
/* /*
If ON DUP KEY UPDATE updates a row instead of inserting one, it's If ON DUP KEY UPDATE updates a row instead of inserting one, it's
like a regular UPDATE statement: it should not affect the value of a like a regular UPDATE statement: it should not affect the value of a
@ -1282,6 +1276,8 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
trg_error= (table->triggers && trg_error= (table->triggers &&
table->triggers->process_triggers(thd, TRG_EVENT_UPDATE, table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,
TRG_ACTION_AFTER, TRUE)); TRG_ACTION_AFTER, TRUE));
info->copied++;
}
goto ok_or_after_trg_err; goto ok_or_after_trg_err;
} }