Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0

into mysql.com:/windows/Linux_space/MySQL/mysql-5.1

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
a6f31175 · mskold/marty@linux.site · 2a4de6fc · e71c09b4 · a6f31175
Commit a6f31175 authored Nov 30, 2006 by mskold/marty@linux.site
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +3 -2

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -2759,9 +2759,10 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
  m_write_op= TRUE;
  
  /*
-   * 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);