summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2007-03-20 00:46:19 +0300
committerunknown <evgen@moonbone.local>2007-03-20 00:46:19 +0300
commit3798a7d5008f8f569f779f096b7fc1e1cfac1031 (patch)
tree3b7e2e0ace5a4c41d97286fc75c592e9c9d429c8 /mysql-test/t
parent6d93f15039d551f291232c1b60527b00cd9c6bc9 (diff)
downloadmariadb-git-3798a7d5008f8f569f779f096b7fc1e1cfac1031.tar.gz
sql_insert.cc:
Removed wrong fix for the bug#27006. The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21. trigger.test, trigger.result: Corrected test case for the bug#27006. sql/sql_insert.cc: Removed wrong fix for the bug#27006. The bug was added by the fix for the bug#19978 and fixed by Monty on 2007/02/21. mysql-test/t/trigger.test: Corrected test case for the bug#27006. mysql-test/r/trigger.result: Corrected test case for the bug#27006.
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/trigger.test6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test
index 49b7b527bd9..a01efba11db 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;