diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp index b07f0d36c..93ab2833c 100644 --- a/src/server/database/Database/MySQLConnection.cpp +++ b/src/server/database/Database/MySQLConnection.cpp @@ -51,16 +51,16 @@ MySQLConnectionInfo::MySQLConnectionInfo(std::string_view infoString) MySQLConnection::MySQLConnection(MySQLConnectionInfo& connInfo) : m_reconnecting(false), m_prepareError(false), - m_queue(nullptr), m_Mysql(nullptr), + m_queue(nullptr), m_connectionInfo(connInfo), m_connectionFlags(CONNECTION_SYNCH) { } MySQLConnection::MySQLConnection(ProducerConsumerQueue* queue, MySQLConnectionInfo& connInfo) : m_reconnecting(false), m_prepareError(false), - m_queue(queue), m_Mysql(nullptr), + m_queue(queue), m_connectionInfo(connInfo), m_connectionFlags(CONNECTION_ASYNC) { diff --git a/src/server/database/Database/MySQLConnection.h b/src/server/database/Database/MySQLConnection.h index 2ad64cb5b..6e437e2e8 100644 --- a/src/server/database/Database/MySQLConnection.h +++ b/src/server/database/Database/MySQLConnection.h @@ -98,19 +98,18 @@ protected: void PrepareStatement(uint32 index, std::string_view sql, ConnectionFlags flags); virtual void DoPrepareStatements() = 0; + virtual bool _HandleMySQLErrno(uint32 errNo, uint8 attempts = 5); typedef std::vector> PreparedStatementContainer; PreparedStatementContainer m_stmts; //! PreparedStatements storage bool m_reconnecting; //! Are we reconnecting? bool m_prepareError; //! Was there any error while preparing statements? + MySQLHandle* m_Mysql; //! MySQL Handle. private: - bool _HandleMySQLErrno(uint32 errNo, uint8 attempts = 5); - ProducerConsumerQueue* m_queue; //! Queue shared with other asynchronous connections. std::unique_ptr m_worker; //! Core worker task. - MySQLHandle* m_Mysql; //! MySQL Handle. MySQLConnectionInfo& m_connectionInfo; //! Connection info (used for logging) ConnectionFlags m_connectionFlags; //! Connection flags (for preparing relevant statements) std::mutex m_Mutex;