diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2021-08-27 18:40:20 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-13 22:37:07 +0100 |
| commit | b7addbafe888238b9aecb3b5cb3f33224d7f396e (patch) | |
| tree | 294e10f0cb08e0802400031b99d4ce1bd29179d1 /src | |
| parent | b5c9310e1490b20e9477773d02919d87fbc97a52 (diff) | |
Core/DB: Improve MySQL version check messages (#26866)
* Core/DB: Improve MySQL version check messages
* Make it more clear that any version above the required one is supported
* Implement feedback
(cherry picked from commit d9a0db79a8f74254afa31bbc26ab506fa00203c1)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/database/Database/DatabaseWorkerPool.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp index 4ff49812f0b..87efe6072f6 100644 --- a/src/server/database/Database/DatabaseWorkerPool.cpp +++ b/src/server/database/Database/DatabaseWorkerPool.cpp @@ -40,7 +40,9 @@ #endif #define MIN_MYSQL_SERVER_VERSION 50700u +#define MIN_MYSQL_SERVER_VERSION_STRING "5.7" #define MIN_MYSQL_CLIENT_VERSION 50700u +#define MIN_MYSQL_CLIENT_VERSION_STRING "5.7" class PingOperation : public SQLOperation { @@ -58,7 +60,7 @@ DatabaseWorkerPool<T>::DatabaseWorkerPool() _async_threads(0), _synch_threads(0) { 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.7, please update your MySQL server"); + WPFatal(mysql_get_client_version() >= MIN_MYSQL_CLIENT_VERSION, "TrinityCore does not support MySQL versions below " MIN_MYSQL_CLIENT_VERSION_STRING " (found %s id %lu, need id >= %u), please update your MySQL client library", mysql_get_client_info(), mysql_get_client_version(), MIN_MYSQL_CLIENT_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); } @@ -386,7 +388,7 @@ uint32 DatabaseWorkerPool<T>::OpenConnections(InternalIndex type, uint8 numConne } else if (connection->GetServerVersion() < MIN_MYSQL_SERVER_VERSION) { - TC_LOG_ERROR("sql.driver", "TrinityCore does not support MySQL versions below 5.7, please update your MySQL server"); + TC_LOG_ERROR("sql.driver", "TrinityCore does not support MySQL versions below " MIN_MYSQL_SERVER_VERSION_STRING " (found id %u, need id >= %u), please update your MySQL server", connection->GetServerVersion(), MIN_MYSQL_SERVER_VERSION); return 1; } else |