summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
diff options
context:
space:
mode:
authortomas@whalegate.ndb.mysql.com <>2007-05-28 13:23:11 +0200
committertomas@whalegate.ndb.mysql.com <>2007-05-28 13:23:11 +0200
commit186d1534b8734a805e6d8b7a9103f077f8f0526d (patch)
treef9a90c326e494c3a80ea9b3c8f3cc1650058a094 /sql/ha_ndbcluster.cc
parentb46465f3e707b0a3bdfa7c40413484b30002a2fa (diff)
downloadmariadb-git-186d1534b8734a805e6d8b7a9103f077f8f0526d.tar.gz
Bug #28719: multi pk update ignore corrupts data
- check multi update as well as update - this bug is not present in 5.0, but execution patch is wrong, so there are probably other bugs
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index d7326375afb..47815f0fbf1 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -2449,7 +2449,8 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
* 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 && thd->lex->sql_command == SQLCOM_UPDATE)
+ if (m_ignore_dup_key && (thd->lex->sql_command == SQLCOM_UPDATE ||
+ thd->lex->sql_command == SQLCOM_UPDATE_MULTI))
{
int peek_res= peek_indexed_rows(new_data, pk_update);