From: Francis Dupont <fdupont@isc.org>
Date: Sun, 17 Mar 2019 09:16:42 +0000 (+0100)
Subject: [481-er-foreign-duplicate-key-with-child-info] Completed duplicate foreign key errors
X-Git-Tag: Kea-1.6.0-beta~356
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4265d38fbd3db2d0ceeed8db79502bd8bf4bdea8;p=thirdparty%2Fkea.git

[481-er-foreign-duplicate-key-with-child-info] Completed duplicate foreign key errors
---

diff --git a/src/lib/mysql/mysql_connection.h b/src/lib/mysql/mysql_connection.h
index 3aff812582..714af49bb2 100644
--- a/src/lib/mysql/mysql_connection.h
+++ b/src/lib/mysql/mysql_connection.h
@@ -479,10 +479,14 @@ public:
         if (status != 0) {
             // Failure: check for the special case of duplicate entry.
             if ((mysql_errno(mysql_) == ER_DUP_ENTRY)
-#if defined(ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO) && \
-  (ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO != ER_DUP_ENTRY)
-
+#ifdef ER_FOREIGN_DUPLICATE_KEY
+                || (mysql_errno(mysql_) == ER_FOREIGN_DUPLICATE_KEY)
+#endif
+#ifdef ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO
                 || (mysql_errno(mysql_) == ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO)
+#endif
+#ifdef ER_FOREIGN_DUPLICATE_KEY_WITHOUT_CHILD_INFO
+                || (mysql_errno(mysql_) == ER_FOREIGN_DUPLICATE_KEY_WITHOUT_CHILD_INFO)
 #endif
                 ) {
                 isc_throw(DuplicateEntry, "Database duplicate entry error");