From 4265d38fbd3db2d0ceeed8db79502bd8bf4bdea8 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Sun, 17 Mar 2019 10:16:42 +0100 Subject: [PATCH] [481-er-foreign-duplicate-key-with-child-info] Completed duplicate foreign key errors --- src/lib/mysql/mysql_connection.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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"); -- 2.47.2