List:Commits« Previous MessageNext Message »
From:eugene Date:March 16 2007 8:10pm
Subject:bk commit into 5.1 tree (evgen:1.2502)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 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-16 23:10:12+03:00, evgen@stripped +1 -0
  sql_insert.cc:
    Post-merge fix.

  sql/sql_insert.cc@stripped, 2007-03-16 23:09:56+03:00, evgen@stripped +14 -13
    Post-merge fix.

# 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/test-5.1-opt-mysql

--- 1.261/sql/sql_insert.cc	2007-03-16 22:20:14 +03:00
+++ 1.262/sql/sql_insert.cc	2007-03-16 23:09:56 +03:00
@@ -1262,21 +1262,22 @@
              compare_record(table))
         {
           info->updated++;
-          /*
-            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
-            next SELECT LAST_INSERT_ID() or mysql_insert_id().
-            Except if LAST_INSERT_ID(#) was in the INSERT query, which is
-            handled separately by THD::arg_of_last_insert_id_function.
-          */
-          insert_id_for_cur_row= table->file->insert_id_for_cur_row= 0;
-          if (table->next_number_field)
-            table->file->adjust_next_insert_id_after_explicit_value(table->next_number_field->val_int());
-          trg_error= (table->triggers &&
-                      table->triggers->process_triggers(thd, TRG_EVENT_UPDATE,
-                                                        TRG_ACTION_AFTER, TRUE));
           info->copied++;
         }
+        /*
+          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
+          next SELECT LAST_INSERT_ID() or mysql_insert_id().
+          Except if LAST_INSERT_ID(#) was in the INSERT query, which is
+          handled separately by THD::arg_of_last_insert_id_function.
+        */
+        insert_id_for_cur_row= table->file->insert_id_for_cur_row= 0;
+        if (table->next_number_field)
+          table->file->adjust_next_insert_id_after_explicit_value(
+            table->next_number_field->val_int());
+        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 */
Thread
bk commit into 5.1 tree (evgen:1.2502)eugene16 Mar