bk commit into 5.0 tree (evgen:1.2486) BUG#27006

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-20 00:46:19+03:00, evgen@stripped +3 -0
  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.

  mysql-test/r/trigger.result@stripped, 2007-03-20 00:46:03+03:00, evgen@stripped +6 -5
    Corrected test case for the bug#27006.

  mysql-test/t/trigger.test@stripped, 2007-03-20 00:45:30+03:00, evgen@stripped +3 -3
    Corrected test case for the bug#27006.

  sql/sql_insert.cc@stripped, 2007-03-20 00:39:47+03:00, evgen@stripped +5 -5
    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.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/mnt/gentoo64/work/27006-bug-5.0-opt-mysql

--- 1.224/sql/sql_insert.cc	2007-03-16 17:20:54 +03:00
+++ 1.225/sql/sql_insert.cc	2007-03-20 00:39:47 +03:00
@@ -1238,19 +1238,19 @@
         if (table->next_number_field)
           table->file->adjust_next_insert_id_after_explicit_value(
             table->next_number_field->val_int());
-
         info->touched++;
+
         if ((table->file->table_flags() & HA_PARTIAL_COLUMN_READ) ||
             compare_record(table, thd->query_id))
         {
           info->updated++;
+          trg_error= (table->triggers &&
+                      table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,
+                                                        TRG_ACTION_AFTER,
+                                                        TRUE));
           info->copied++;
         }
 
-        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 */

--- 1.56/mysql-test/r/trigger.result	2007-03-16 17:21:22 +03:00
+++ 1.57/mysql-test/r/trigger.result	2007-03-20 00:46:03 +03:00
@@ -1398,18 +1398,19 @@
 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;

--- 1.63/mysql-test/t/trigger.test	2007-03-16 17:21:43 +03:00
+++ 1.64/mysql-test/t/trigger.test	2007-03-20 00:45:30 +03:00
@@ -1700,8 +1700,7 @@
 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 @@
 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;