diff options
| author | unknown <evgen@moonbone.local> | 2007-03-20 01:29:09 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-03-20 01:29:09 +0300 |
| commit | ca16e7038cf12bc70a995decbb6e347337139bb8 (patch) | |
| tree | ece1e13959d1fc43f206693dd5f3c68ab334ccd5 | |
| parent | 84d24679b955ede6ad0194100355fe4b9139301a (diff) | |
| parent | 3798a7d5008f8f569f779f096b7fc1e1cfac1031 (diff) | |
| download | mariadb-git-ca16e7038cf12bc70a995decbb6e347337139bb8.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
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/sql_insert.cc:
Manually merged.
| -rw-r--r-- | mysql-test/r/trigger.result | 11 | ||||
| -rw-r--r-- | mysql-test/t/trigger.test | 6 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 5 |
3 files changed, 14 insertions, 8 deletions
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index edd083f73aa..c24f7b6b06f 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -1398,18 +1398,19 @@ id val 1 test1 2 test2 INSERT INTO t1 VALUES (2,'test2') ON DUPLICATE KEY UPDATE val=VALUES(val); -INSERT INTO t1 VALUES (3,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val); +INSERT INTO t1 VALUES (2,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val); +INSERT INTO t1 VALUES (3,'test4') ON DUPLICATE KEY UPDATE val=VALUES(val); SELECT * FROM t1; id val 1 test1 -2 test2 -3 test3 +2 test3 +3 test4 SELECT * FROM t2; id val 1 test1 2 test2 -3 test2 -4 test3 +3 test3 +4 test4 DROP TRIGGER trg27006_a_insert; DROP TRIGGER trg27006_a_update; drop table t1,t2; diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test index 22d3a68ba74..55b67adf7c6 100644 --- a/mysql-test/t/trigger.test +++ b/mysql-test/t/trigger.test @@ -1700,8 +1700,7 @@ DROP PROCEDURE bug22580_proc_1; DROP PROCEDURE bug22580_proc_2; # -# Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY -# UPDATE if the row wasn't actually changed. +# Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE # --disable_warnings DROP TRIGGER IF EXISTS trg27006_a_update; @@ -1730,7 +1729,8 @@ INSERT INTO t1(val) VALUES ('test1'),('test2'); SELECT * FROM t1; SELECT * FROM t2; INSERT INTO t1 VALUES (2,'test2') ON DUPLICATE KEY UPDATE val=VALUES(val); -INSERT INTO t1 VALUES (3,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val); +INSERT INTO t1 VALUES (2,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val); +INSERT INTO t1 VALUES (3,'test4') ON DUPLICATE KEY UPDATE val=VALUES(val); SELECT * FROM t1; SELECT * FROM t2; DROP TRIGGER trg27006_a_insert; 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 */ |