From: Razvan Becheriu <razvan@isc.org>
Date: Mon, 28 Oct 2019 16:10:55 +0000 (+0200)
Subject: [#887,!572] implement mysql thread handle
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5d165a7a13928ad981d7fb659b55df72b1c9d46;p=thirdparty%2Fkea.git

[#887,!572] implement mysql thread handle
---

diff --git a/src/lib/mysql/mysql_connection.h b/src/lib/mysql/mysql_connection.h
index 118e388fdf..e79f71d5be 100644
--- a/src/lib/mysql/mysql_connection.h
+++ b/src/lib/mysql/mysql_connection.h
@@ -108,39 +108,11 @@ public:
         // @note Moved the call to mysql_library_end() to atexit.
     }
 
-    /// @brief Clear all resources
-    ///
-    /// Clear all resources.
-    void clear() {
-        setConnection(NULL);
-    }
-
-    /// @brief Clear prepared statements
-    ///
-    /// Clear prepared statements.
-    void clearPrepared();
-
     /// @brief Sets the connection to the value given
     ///
-    /// Sets the database back-end object.
-    ///
-    /// @param connection - pointer to the MySql connection instance
+    /// @param connection - pointer to the MYSQL connection instance
     void setConnection(MYSQL* connection);
 
-    /// @brief Open database
-    ///
-    /// Open database and apply MySql connection parameters.
-    ///
-    /// @param connection - associated connection which holds connection properties.
-    void openDatabase(MySqlConnection& connection);
-
-    /// @brief Prepare statements
-    ///
-    /// Prepare statements.
-    ///
-    /// @param connection - associated connection which holds the text statements.
-    void prepareStatements(MySqlConnection& connection);
-
     /// @brief Conversion Operator
     ///
     /// Allows the MySqlHolder object to be passed as the context argument to
@@ -149,20 +121,27 @@ public:
         return (mysql_);
     }
 
+    void clear() {
+        setConnection(NULL);
+    }
+
+    void clearPrepared();
+
+    void openDatabase(MySqlConnection& connection);
+
+    void prepareStatements(MySqlConnection& connection);
+
     /// @brief Prepared statements
     ///
     /// This field is public, because it is used heavily from MySqlConnection
     /// and from MySqlHostDataSource.
     std::vector<MYSQL_STMT*> statements_;
 
-    /// @brief The connected flag
     bool connected_;     ///< Flag to indicate openDatabase has been called
 
 private:
-    /// @brief The prepared flag
     bool prepared_;      ///< Flag to indicate prepareStatements has been called
 
-    /// @brief The atexit parameter called only once on initialization
     static bool atexit_; ///< Flag to call atexit once.
 
     /// @brief The MySql database back-end object associated to this holder