diff options
Diffstat (limited to 'src')
| -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 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_server.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp index 574306c86f2..21f3ff423b3 100644 --- a/src/server/database/Database/DatabaseWorkerPool.cpp +++ b/src/server/database/Database/DatabaseWorkerPool.cpp @@ -55,8 +55,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 a654ef43eb3..6e75bdee939 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 diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index c9378dcf04c..464e9b7257a 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -137,7 +137,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()); |
