diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-06-14 20:22:43 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-06-14 20:22:43 +0200 |
| commit | 1d3875aceb8d5cbbc6661a389d2f13aea16501fd (patch) | |
| tree | 7f353e9d51c6c7646c3704a943a685106d005979 /sql/ha_ndbcluster.cc | |
| parent | 06828ae5132675835a8aa6a770d8380e3b651ce3 (diff) | |
| parent | f3a286cc5466f04c4c72a81f15f80c2f03a175a3 (diff) | |
| download | mariadb-git-1d3875aceb8d5cbbc6661a389d2f13aea16501fd.tar.gz | |
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
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 2618656193a..ffd5932a5c1 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -3053,7 +3053,7 @@ void ha_ndbcluster::start_bulk_insert(ha_rows rows) DBUG_PRINT("enter", ("rows: %d", (int)rows)); 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 |