diff options
| author | unknown <mskold/marty@linux.site> | 2006-11-30 17:28:08 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2006-11-30 17:28:08 +0100 |
| commit | 8ee58b541447a46ef168b44317caefe9b533fbf7 (patch) | |
| tree | 99df81ab31b6ef4aa589d2af1e2d69c68cc55d0b | |
| parent | e55ec337623fee7ad270b8df4cf65333d8571071 (diff) | |
| parent | c4382bc5b19ae4e7694911f5c507d0267c6ec82d (diff) | |
| download | mariadb-git-8ee58b541447a46ef168b44317caefe9b533fbf7.tar.gz | |
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
| -rw-r--r-- | sql/ha_ndbcluster.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index cc13e652a47..59f213394ad 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -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); |