database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql

Browse Source 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
This commit is contained in:
evgen@moonbone.local
2007-03-20 01:29:09 +03:00
parent cb89159eb1 31b9145ab3
commit 37add3b661
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_insert.cc
View File

@@ -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 */