diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-03-05 20:16:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 20:16:49 +0100 |
| commit | 0752584856b0d9c2a1a5b179cf90d3bc765fa2c1 (patch) | |
| tree | 33743ad890248876611c1eab3972942220424c7d /src/server/database/Database | |
| parent | 6bbc9da2c7bfb4ecadd35b2ebb42b6dadd25e559 (diff) | |
Core/Database: Fix build with Maria DB on some distros (#24248)
Diffstat (limited to 'src/server/database/Database')
| -rw-r--r-- | src/server/database/Database/DatabaseWorkerPool.cpp | 4 | ||||
| -rw-r--r-- | src/server/database/Database/MySQLThreading.cpp | 4 | ||||
| -rw-r--r-- | src/server/database/Database/MySQLThreading.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp index 3005c973960..83d2adaede7 100644 --- a/src/server/database/Database/DatabaseWorkerPool.cpp +++ b/src/server/database/Database/DatabaseWorkerPool.cpp @@ -54,8 +54,8 @@ DatabaseWorkerPool<T>::DatabaseWorkerPool() { WPFatal(mysql_thread_safe(), "Used MySQL library isn't thread-safe."); WPFatal(mysql_get_client_version() >= MIN_MYSQL_CLIENT_VERSION, "TrinityCore does not support MySQL versions below 5.1"); - WPFatal(mysql_get_client_version() == MYSQL_VERSION_ID, "Used MySQL library version (%s) does not match the version used to compile TrinityCore (%s). Search on forum for TCE00011.", - mysql_get_client_info(), MYSQL_SERVER_VERSION); + WPFatal(mysql_get_client_version() == MYSQL_VERSION_ID, "Used MySQL library version (%s id %lu) does not match the version id used to compile TrinityCore (id %u). Search on forum for TCE00011.", + mysql_get_client_info(), mysql_get_client_version(), MYSQL_VERSION_ID); } template <class T> diff --git a/src/server/database/Database/MySQLThreading.cpp b/src/server/database/Database/MySQLThreading.cpp index d373393f284..e3f396d543c 100644 --- a/src/server/database/Database/MySQLThreading.cpp +++ b/src/server/database/Database/MySQLThreading.cpp @@ -28,7 +28,7 @@ void MySQL::Library_End() mysql_library_end(); } -char const* MySQL::GetLibraryVersion() +uint32 MySQL::GetLibraryVersion() { - return MYSQL_SERVER_VERSION; + return MYSQL_VERSION_ID; } diff --git a/src/server/database/Database/MySQLThreading.h b/src/server/database/Database/MySQLThreading.h index 57710ead1ea..4888395e5eb 100644 --- a/src/server/database/Database/MySQLThreading.h +++ b/src/server/database/Database/MySQLThreading.h @@ -24,7 +24,7 @@ namespace MySQL { TC_DATABASE_API void Library_Init(); TC_DATABASE_API void Library_End(); - TC_DATABASE_API char const* GetLibraryVersion(); + TC_DATABASE_API uint32 GetLibraryVersion(); } #endif |