From d0eae390b61377c569af4bcf2ac647a23a21800b Mon Sep 17 00:00:00 2001 From: Mike Delago <32778141+michaeldelago@users.noreply.github.com> Date: Sun, 21 Jan 2024 08:48:57 -0500 Subject: fix(Core/DatabseWorkerPool): implement DatabaseIncompatibleVersion to better support MariaDB (#18201) * fix(Core): Rework Database Version Check for MariaDB support * incorporate "smarter" version comparison * rename function to be more accurate * Factor magic numbers into defines. Revise comments * clean up triple newline * Doxygenify the docs * remove blankspace --------- Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com> --- src/server/database/Database/MySQLConnection.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/server/database/Database/MySQLConnection.cpp') diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp index 73c3653cb8..3e776059a1 100644 --- a/src/server/database/Database/MySQLConnection.cpp +++ b/src/server/database/Database/MySQLConnection.cpp @@ -27,8 +27,8 @@ #include "Timer.h" #include "Tokenize.h" #include "Transaction.h" -#include "Util.h" #include +#include #include MySQLConnectionInfo::MySQLConnectionInfo(std::string_view infoString) @@ -486,6 +486,11 @@ uint32 MySQLConnection::GetServerVersion() const return mysql_get_server_version(m_Mysql); } +std::string MySQLConnection::GetServerInfo() const +{ + return mysql_get_server_info(m_Mysql); +} + MySQLPreparedStatement* MySQLConnection::GetPreparedStatement(uint32 index) { ASSERT(index < m_stmts.size(), "Tried to access invalid prepared statement index {} (max index {}) on database `{}`, connection type: {}", -- cgit v1.2.3