Commit ca16e703 authored by unknown's avatar unknown
Browse files

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.
parents 84d24679 3798a7d5

mysql-test/r/trigger.result

+6 −5
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/trigger.test

+3 −3
Original line number Diff line number Diff line
@@ -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;

sql/sql_insert.cc

+5 −0
Original line number Diff line number Diff line
@@ -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 */