Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Database: Fix build with Maria DB on some distros (#24248)

Browse Source
This commit is contained in:
Giacomo Pozzoni
2020-03-05 20:16:49 +01:00
committed by GitHub
parent 6bbc9da2c7
commit 0752584856
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/database/Database/DatabaseWorkerPool.cpp
View File

@@ -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>

4
src/server/database/Database/MySQLThreading.cpp
View File

@@ -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;
}

2
src/server/database/Database/MySQLThreading.h
View File

@@ -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

2
src/server/scripts/Commands/cs_server.cpp
View File

@@ -138,7 +138,7 @@ public:
handler->PSendSysMessage("%s", GitRevision::GetFullVersion());
handler->PSendSysMessage("Using SSL version: %s (library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
handler->PSendSysMessage("Using Boost version: %i.%i.%i", BOOST_VERSION / 100000, BOOST_VERSION / 100 % 1000, BOOST_VERSION % 100);
handler->PSendSysMessage("Using MySQL version: %s", MySQL::GetLibraryVersion());
handler->PSendSysMessage("Using MySQL version: %u", MySQL::GetLibraryVersion());
handler->PSendSysMessage("Using CMake version: %s", GitRevision::GetCMakeVersion());
handler->PSendSysMessage("Compiled on: %s", GitRevision::GetHostOSVersion());