From bbc11d1920687d2e88c0fd24697032fd9a1b673f Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 14 Apr 2020 13:04:12 +1200
Subject: [PATCH] Attempt to remove UPDATE IGNORE+Delete & just use reliable
 update

Now we are no longer doing weird stuff with custom fields this should suffice
---
 CRM/Dedupe/Merger.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index c19ed52f2a..851a1287dd 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -543,8 +543,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
 
           $preOperationSqls = self::operationSql($mainId, $otherId, $table, $tableOperations);
           $sqls = array_merge($sqls, $preOperationSqls);
-          $sqls[] = "UPDATE IGNORE $table SET $field = $mainId WHERE $field = $otherId";
-          $sqls[] = "DELETE FROM $table WHERE $field = $otherId";
+          $sqls[] = "UPDATE $table SET $field = $mainId WHERE $field = $otherId";
         }
       }
 
-- 
2.25.1