mirror of
https://github.com/MariaDB/server.git
synced 2025-02-20 04:15:35 +01:00
Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
This commit is contained in:
commit
37add3b661
3 changed files with 14 additions and 8 deletions
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -1262,6 +1262,10 @@ 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++;
|
info->copied++;
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
|
@ -1278,6 +1282,7 @@ 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));
|
||||||
|
|
||||||
goto ok_or_after_trg_err;
|
goto ok_or_after_trg_err;
|
||||||
}
|
}
|
||||||
else /* DUP_REPLACE */
|
else /* DUP_REPLACE */
|
||||||
|
|
Loading…
Add table
Reference in a new issue