From: Date: November 30 2006 5:22pm
Subject: bk commit into 5.0 tree (mskold:1.2286) BUG#18487
List-Archive: http://lists.mysql.com/commits/16230
X-Bug: 18487
Message-Id: <20061130162213.1561D204A47@linux.site>

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty 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, 2006-11-30 17:22:04+01:00, mskold@stripped +1 -0
  bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: handle INSERT ... ON DUPLICATE KEY UPDATE

  sql/ha_ndbcluster.cc@stripped, 2006-11-30 17:21:47+01:00, mskold@stripped +3 -2
    bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: handle INSERT ... ON DUPLICATE KEY UPDATE

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.0

--- 1.287/sql/ha_ndbcluster.cc	2006-11-30 17:22:12 +01:00
+++ 1.288/sql/ha_ndbcluster.cc	2006-11-30 17:22:12 +01:00
@@ -2388,9 +2388,10 @@ int ha_ndbcluster::update_row(const byte
   DBUG_ENTER("update_row");
   
   /*
-   * If IGNORE the ignore constraint violations on primary and unique keys
+   * If IGNORE the ignore constraint violations on primary and unique keys,
+   * but check that it is not part of INSERT ... ON DUPLICATE KEY UPDATE
    */
-  if (m_ignore_dup_key)
+  if (m_ignore_dup_key && thd->lex->sql_command != SQLCOM_INSERT)
   {
     int peek_res= peek_indexed_rows(new_data);