diff options
| author | Mike Delago <32778141+michaeldelago@users.noreply.github.com> | 2024-01-21 08:48:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-21 14:48:57 +0100 |
| commit | d0eae390b61377c569af4bcf2ac647a23a21800b (patch) | |
| tree | 8c0f8f698fb578eff21e2a6b28187af21f36cc6e /src/server/database/Database/MySQLConnection.cpp | |
| parent | e447351b0fdb9a2d820f76b3a6cf5712d2e8b9c3 (diff) | |
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>
Diffstat (limited to 'src/server/database/Database/MySQLConnection.cpp')
| -rw-r--r-- | src/server/database/Database/MySQLConnection.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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 <errmsg.h> +#include <mysql.h> #include <mysqld_error.h> 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: {}", |