[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 3aff81258200d8823fdc0dc8376377c0f1fbed59..714af49bb29adb8cc65851f9dcbc1c302920209e 100644 (file)
--- 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");