bk commit into 5.0 tree (mronstrom:1.1822)

[mikael]

Below is the list of changes that have just been committed into a local
5.0 repository of mikron. When mikron 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
  1.1822 05/03/09 00:18:37 mronstrom@stripped +1 -0
  Yet another bug found in review of own code (WL 2445)

  sql/sql_update.cc
    1.154 05/03/09 00:18:28 mronstrom@stripped +6 -5
    Yet another bug found in review of own code (WL 2445)

# 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:	mronstrom
# Host:	c-7e0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
# Root:	/Users/mikron/mysql-5.0

--- 1.153/sql/sql_update.cc	Tue Mar  8 22:27:42 2005
+++ 1.154/sql/sql_update.cc	Wed Mar  9 00:18:28 2005
@@ -532,13 +532,14 @@
   if (thd->killed && !error)
     error= 1;					// Aborted
   else if (will_batch &&
-           ((loc_error= table->file->exec_bulk_update(&dup_key_found)) &&
-            !ignore))
+           (loc_error= table->file->exec_bulk_update(&dup_key_found)))
     /*
       An error has occurred when a batched update was performed and returned
-      an error indication and we are not ignoring errors.
-      Otherwise we simply remove the number of duplicate keys and error
-      records found in batched update.
+      an error indication. It cannot be an allowed duplicate key error since
+      we require the batching handler to treat this as a normal behavior.
+
+      Otherwise we simply remove the number of duplicate keys records found
+      in the batched update.
     */
   {
     thd->fatal_error();