]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[354-compilation-with-mysql-fails-on-fedora-29] Simplified patch 354-compilation-with-mysql-fails-on-fedora-29
authorFrancis Dupont <fdupont@isc.org>
Sat, 2 Feb 2019 09:08:13 +0000 (10:08 +0100)
committerFrancis Dupont <fdupont@isc.org>
Thu, 7 Feb 2019 22:02:22 +0000 (17:02 -0500)
src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc

index 0f44fcfcc5af3e408e62f2f10674993ffd7cd22c..1152c7e9d32daa1c757106278a655de8dfd0193d 100644 (file)
@@ -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() {