Commit 8ee58b54 authored by unknown's avatar unknown
Browse files

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

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


sql/ha_ndbcluster.cc:
  Auto merged
parents e55ec337 c4382bc5

sql/ha_ndbcluster.cc

+3 −2
Original line number Diff line number Diff line
@@ -2835,9 +2835,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);