From 249c7be76ace172590eaa0a3fc2f4505c84d4fe3 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Sat, 2 Feb 2019 10:08:13 +0100 Subject: [PATCH] [354-compilation-with-mysql-fails-on-fedora-29] Simplified patch --- src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc index 0f44fcfcc5..1152c7e9d3 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc @@ -68,17 +68,10 @@ MySqlConfigBackendImpl(const DatabaseConnection::ParameterMap& parameters) // caused issues for some unit tests which were unable to cleanup // the database after the test because of pending transactions. // Use of autocommit will eliminate this problem. -#ifdef HAVE_MYSQL_MY_BOOL my_bool result = mysql_autocommit(conn_.mysql_, 1); - if (result != 0) { + if (result != MLM_FALSE) { isc_throw(DbOperationError, mysql_error(conn_.mysql_)); } -#else - bool result = mysql_autocommit(conn_.mysql_, 1); - if (!result) { - isc_throw(DbOperationError, mysql_error(conn_.mysql_)); - } -#endif } MySqlConfigBackendImpl::~MySqlConfigBackendImpl() { -- 2.47.2