From 0abbcf182b34ed049809d3fbab0c47a8c394fae1 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Sat, 16 Mar 2019 00:00:39 +0100 Subject: [PATCH] [481-er-foreign-duplicate-key-with-child-info] Made ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO optional --- src/lib/mysql/mysql_connection.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib/mysql/mysql_connection.h b/src/lib/mysql/mysql_connection.h index f5841999af..3aff812582 100644 --- 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"); -- 2.47.2