[#2034] atexit(mysql_library_end())

diff --git a/src/lib/mysql/mysql_connection.cc b/src/lib/mysql/mysql_connection.cc
index cb96f03aa10f754637a05a2db18cc4aae011e092..0ef5f37ec88ffa25f25b4b4ef4d3b4ef7189fd4b 100644 (file)
--- 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 8c279c9e355a9fe2f8a7b8a2794cc6db5db0b029..767e385e1ea87dc3955c13fc4b473345eb4efbb7 100644 (file)
--- 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.