From: Andrei Pavel <andrei@isc.org>
Date: Fri, 10 Sep 2021 15:24:08 +0000 (+0300)
Subject: [#2034] atexit(mysql_library_end())
X-Git-Tag: Kea-2.0.0~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc2c293206a72a8dfa66722e90910da85389933b;p=thirdparty%2Fkea.git

[#2034] atexit(mysql_library_end())
---

diff --git a/src/lib/mysql/mysql_connection.cc b/src/lib/mysql/mysql_connection.cc
index cb96f03aa1..0ef5f37ec8 100644
--- a/src/lib/mysql/mysql_connection.cc
+++ b/src/lib/mysql/mysql_connection.cc
@@ -23,7 +23,9 @@ using namespace std;
 namespace isc {
 namespace db {
 
-bool MySqlHolder::atexit_ = []{atexit([]{mysql_library_end();});return true;};
+int MySqlHolder::atexit_ = [] {
+    return atexit([] { mysql_library_end(); });
+}();
 
 /// @todo: Migrate this default value to src/bin/dhcpX/simple_parserX.cc
 const int MYSQL_DEFAULT_CONNECTION_TIMEOUT = 5; // seconds
diff --git a/src/lib/mysql/mysql_connection.h b/src/lib/mysql/mysql_connection.h
index 8c279c9e35..767e385e1e 100644
--- a/src/lib/mysql/mysql_connection.h
+++ b/src/lib/mysql/mysql_connection.h
@@ -161,9 +161,11 @@ public:
     }
 
 private:
-    static bool atexit_; ///< Flag to call atexit once.
+    /// @brief Variable used for its static property to call atexit() once.
+    static int atexit_;
 
-    MYSQL* mysql_;       ///< Initialization context
+    /// @brief Initialization context
+    MYSQL* mysql_;
 };
 
 /// @brief Forward declaration to @ref MySqlConnection.