Commit b9d51b15 authored by unknown's avatar unknown
Browse files

bug#24303 Wrong result for UPDATE IGNORE for NDB table: bug fix reverted, fix... 

bug#24303  Wrong result for UPDATE IGNORE for NDB table: bug fix reverted, fix for bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key, solves it a better way
parent d6e2895d

sql/ha_ndbcluster.cc

+0 −12
Original line number Diff line number Diff line
@@ -3852,18 +3852,6 @@ int ha_ndbcluster::extra(enum ha_extra_function operation) 
    DBUG_PRINT("info", ("HA_EXTRA_IGNORE_DUP_KEY"));

    DBUG_PRINT("info", ("Ignoring duplicate key"));

    m_ignore_dup_key= TRUE;

    if (current_thd->lex->sql_command == SQLCOM_UPDATE &&

	table_share->primary_key != MAX_KEY &&

	bitmap_is_set(table->write_set, table_share->primary_key))

    {

      /*

	An UPDATE and table has a primary key that is 

	about to be updated

	We need to read all fields for UPDATE IGNORE of pk

	since this is implemented as delete+insert

      */

      bitmap_set_all(table->read_set);

    }

    break;

  case HA_EXTRA_NO_IGNORE_DUP_KEY:

    DBUG_PRINT("info", ("HA_EXTRA_NO_IGNORE_DUP_KEY"));