database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51

Browse Source 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
This commit is contained in:
tsmith@quadxeon.mysql.com
2007-03-20 09:00:38 +01:00
parent f2fc78e81a 45fb6c90f0
commit f1b1eb030b
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/r/trigger.result
View File

@ -1398,18 +1398,19 @@ id val
1 test1 1 test1
2 test2 2 test2
INSERT INTO t1 VALUES (2,'test2') ON DUPLICATE KEY UPDATE val=VALUES(val); 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 t1;
id val id val
1 test1 1 test1
2 test2 2 test3
3 test3 3 test4
SELECT * FROM t2; SELECT * FROM t2;
id val id val
1 test1 1 test1
2 test2 2 test2
3 test2 3 test3
4 test3 4 test4
DROP TRIGGER trg27006_a_insert; DROP TRIGGER trg27006_a_insert;
DROP TRIGGER trg27006_a_update; DROP TRIGGER trg27006_a_update;
drop table t1,t2; drop table t1,t2;

6
mysql-test/t/trigger.test
View File

@ -1700,8 +1700,7 @@ DROP PROCEDURE bug22580_proc_1;
DROP PROCEDURE bug22580_proc_2; DROP PROCEDURE bug22580_proc_2;
# #
# Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY # Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE
# UPDATE if the row wasn't actually changed.
# #
--disable_warnings --disable_warnings
DROP TRIGGER IF EXISTS trg27006_a_update; DROP TRIGGER IF EXISTS trg27006_a_update;
@ -1730,7 +1729,8 @@ INSERT INTO t1(val) VALUES ('test1'),('test2');
SELECT * FROM t1; SELECT * FROM t1;
SELECT * FROM t2; SELECT * FROM t2;
INSERT INTO t1 VALUES (2,'test2') ON DUPLICATE KEY UPDATE val=VALUES(val); 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 t1;
SELECT * FROM t2; SELECT * FROM t2;
DROP TRIGGER trg27006_a_insert; DROP TRIGGER trg27006_a_insert;

5
sql/sql_insert.cc
View File

@ -1260,8 +1260,6 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
compare_record(table)) compare_record(table))
{ {
info->updated++; info->updated++;
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
@ -1276,6 +1274,9 @@ 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;
} }
else /* DUP_REPLACE */ else /* DUP_REPLACE */