Commit 1d3875ac authored by unknown's avatar unknown

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main


sql/ha_ndbcluster.cc:
  Auto merged
parents 06828ae5 f3a286cc
...@@ -3053,7 +3053,7 @@ void ha_ndbcluster::start_bulk_insert(ha_rows rows) ...@@ -3053,7 +3053,7 @@ void ha_ndbcluster::start_bulk_insert(ha_rows rows)
DBUG_PRINT("enter", ("rows: %d", (int)rows)); DBUG_PRINT("enter", ("rows: %d", (int)rows));
m_rows_inserted= (ha_rows) 0; m_rows_inserted= (ha_rows) 0;
if (!m_use_write && m_ignore_dup_key) if (m_ignore_dup_key && table->primary_key != MAX_KEY)
{ {
/* /*
compare if expression with that in write_row compare if expression with that in write_row
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment