[481-er-foreign-duplicate-key-with-child-info] Made ER_FOREIGN_DUPLICATE_KEY_WITH_CHI...

diff --git a/src/lib/mysql/mysql_connection.h b/src/lib/mysql/mysql_connection.h
index f5841999afe087eeb3cb065c77d2b57eb4afe619..3aff81258200d8823fdc0dc8376377c0f1fbed59 100644 (file)
--- a/src/lib/mysql/mysql_connection.h
+++ b/src/lib/mysql/mysql_connection.h
@@ -478,8 +478,13 @@ public:
 
         if (status != 0) {
             // Failure: check for the special case of duplicate entry.
-            if ((mysql_errno(mysql_) == ER_DUP_ENTRY) ||
-                (mysql_errno(mysql_) == ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO)) {
+            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)
+
+                || (mysql_errno(mysql_) == ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO)
+#endif
+                ) {
                 isc_throw(DuplicateEntry, "Database duplicate entry error");
             }
             checkError(status, index, "unable to execute");