From 5f06c476f6b0c6542afdb5e64c1dcfbbcf39dc39 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 1 Nov 2019 16:21:14 +0100 Subject: Core/DBLayer: Support using mysql 8 (cherry picked from commit c3a9d56b56b665133707f587ecb1bd1c272f6911) --- src/server/database/Database/QueryResult.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/server/database/Database/QueryResult.h') diff --git a/src/server/database/Database/QueryResult.h b/src/server/database/Database/QueryResult.h index 230944135f6..3e193341937 100644 --- a/src/server/database/Database/QueryResult.h +++ b/src/server/database/Database/QueryResult.h @@ -26,7 +26,7 @@ class TC_DATABASE_API ResultSet { public: - ResultSet(MYSQL_RES* result, MYSQL_FIELD* fields, uint64 rowCount, uint32 fieldCount); + ResultSet(MySQLResult* result, MySQLField* fields, uint64 rowCount, uint32 fieldCount); ~ResultSet(); bool NextRow(); @@ -43,8 +43,8 @@ class TC_DATABASE_API ResultSet private: void CleanUp(); - MYSQL_RES* _result; - MYSQL_FIELD* _fields; + MySQLResult* _result; + MySQLField* _fields; ResultSet(ResultSet const& right) = delete; ResultSet& operator=(ResultSet const& right) = delete; @@ -53,7 +53,7 @@ class TC_DATABASE_API ResultSet class TC_DATABASE_API PreparedResultSet { public: - PreparedResultSet(MYSQL_STMT* stmt, MYSQL_RES* result, uint64 rowCount, uint32 fieldCount); + PreparedResultSet(MySQLStmt* stmt, MySQLResult* result, uint64 rowCount, uint32 fieldCount); ~PreparedResultSet(); bool NextRow(); @@ -70,9 +70,9 @@ class TC_DATABASE_API PreparedResultSet uint32 m_fieldCount; private: - MYSQL_BIND* m_rBind; - MYSQL_STMT* m_stmt; - MYSQL_RES* m_metadataResult; ///< Field metadata, returned by mysql_stmt_result_metadata + MySQLBind* m_rBind; + MySQLStmt* m_stmt; + MySQLResult* m_metadataResult; ///< Field metadata, returned by mysql_stmt_result_metadata void CleanUp(); bool _NextRow(); -- cgit v1.2.3