From: Francis Dupont <fdupont@isc.org>
Date: Wed, 13 Mar 2019 10:47:56 +0000 (+0100)
Subject: [master] Fixed #481 merge error
X-Git-Tag: Kea-1.6.0-beta~384
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddc054076bbdae054b3f73fa2ec88abdfd1f6345;p=thirdparty%2Fkea.git

[master] Fixed #481 merge error
---

diff --git a/src/lib/mysql/mysql_connection.h b/src/lib/mysql/mysql_connection.h
index 2b59d8dbbb..f5841999af 100644
--- a/src/lib/mysql/mysql_connection.h
+++ b/src/lib/mysql/mysql_connection.h
@@ -478,7 +478,8 @@ public:
 
         if (status != 0) {
             // Failure: check for the special case of duplicate entry.
-            if (mysql_errno(mysql_) == ER_DUP_ENTRY) {
+            if ((mysql_errno(mysql_) == ER_DUP_ENTRY) ||
+                (mysql_errno(mysql_) == ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO)) {
                 isc_throw(DuplicateEntry, "Database duplicate entry error");
             }
             checkError(status, index, "unable to execute");