Commit 1cc765b3 authored by unknown's avatar unknown
Browse files

bug#18487 UPDATE IGNORE not supported for unique constraint violation of... 

bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: handle INSERT ... ON DUPLICATE KEY UPDATE
parent eb36371a

sql/ha_ndbcluster.cc

+3 −2
Original line number Diff line number Diff line
@@ -2388,9 +2388,10 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data) 
  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);