From 04fd8791e1658e08e8016b407ac0b3ee4efdc18d Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Tue, 14 Dec 2021 15:15:44 +0100 Subject: [PATCH] refactor(Core/DB): Deprecate MariaDB 10.4 and below (#9675) --- .github/SECURITY.md | 44 +++++++++---------- src/cmake/macros/FindMySQL.cmake | 2 +- .../database/Database/DatabaseWorkerPool.cpp | 8 ++-- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/SECURITY.md b/.github/SECURITY.md index 4f3e9e624..b68bb1090 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -5,7 +5,9 @@ We support the following versions of dependencies. :white_check_mark: = supported + :red_circle: = NOT supported + unspecified = might work but no guarantee Versions of AzerothCore: @@ -28,40 +30,38 @@ Versions of MariaDB: | --------------- | ------------------ | | 10.6 | :white_check_mark: | | 10.5 | :white_check_mark: | -| 10.4 | :white_check_mark: | -| 10.3 | :white_check_mark: | -| 10.2 | :white_check_mark: | +| 10.4 and lower | :red_circle: | Versions of CLang: -| CLang Version | Supported | -| --------------- | ------------------ | -| 12 | :white_check_mark: | -| 11 | :white_check_mark: | -| 10 | :white_check_mark: | -| 9 and lower | :red_circle: | +| CLang Version | Supported | +| ------------- | ------------------ | +| 12 | :white_check_mark: | +| 11 | :white_check_mark: | +| 10 | :white_check_mark: | +| 9 and lower | :red_circle: | Versions of GCC: -| GCC Version | Supported | -| --------------- | ------------------ | -| 10 | :white_check_mark: | -| 9 | :white_check_mark: | -| 8 | :white_check_mark: | -| 7 and lower | :red_circle: | +| GCC Version | Supported | +| ----------- | ------------------ | +| 10 | :white_check_mark: | +| 9 | :white_check_mark: | +| 8 | :white_check_mark: | +| 7 and lower | :red_circle: | Versions of Ubuntu: -| Ubuntu version | Supported | -| --------------- | ------------------ | -| 20.04 | :white_check_mark: | -| 18.04 | :white_check_mark: | +| Ubuntu version | Supported | +| -------------- | ------------------ | +| 20.04 | :white_check_mark: | +| 18.04 | :white_check_mark: | Versions of macOS: -| macOS Version | Supported | -| --------------- | ------------------ | -| 10.15 | :white_check_mark: | +| macOS Version | Supported | +| ------------- | ------------------ | +| 10.15 | :white_check_mark: | **Note**: We do NOT support any repacks that may or may not have been made based on AzerothCore. Nor do we support any of the releases that are made under AzerothCore. diff --git a/src/cmake/macros/FindMySQL.cmake b/src/cmake/macros/FindMySQL.cmake index 68f53527b..ce3ba455a 100644 --- a/src/cmake/macros/FindMySQL.cmake +++ b/src/cmake/macros/FindMySQL.cmake @@ -40,7 +40,7 @@ endif(WIN32) # Find MariaDB for Windows if (WIN32) # Set know versions MariaDB - set(_MARIADB_KNOWN_VERSIONS "MariaDB 10.6" "MariaDB 10.5" "MariaDB 10.4" "MariaDB 10.3" "MariaDB 10.2") + set(_MARIADB_KNOWN_VERSIONS "MariaDB 10.6" "MariaDB 10.5") # Set default options set(MARIADB_FOUND_LIB 0) diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp index ea74da357..a3f519942 100644 --- a/src/server/database/Database/DatabaseWorkerPool.cpp +++ b/src/server/database/Database/DatabaseWorkerPool.cpp @@ -40,8 +40,8 @@ #endif #if MARIADB_VERSION_ID >= 100600 -#define MIN_MYSQL_SERVER_VERSION 100200u -#define MIN_MYSQL_CLIENT_VERSION 30203u +#define MIN_MYSQL_SERVER_VERSION 100500u +#define MIN_MYSQL_CLIENT_VERSION 30503u #else #define MIN_MYSQL_SERVER_VERSION 50700u #define MIN_MYSQL_CLIENT_VERSION 50700u @@ -72,7 +72,7 @@ DatabaseWorkerPool::DatabaseWorkerPool() bool isSameClientDB = true; // Client version 3.2.3? #endif - WPFatal(isSupportClientDB, "AzerothCore does not support MySQL versions below 5.7 and MariaDB 10.2\nSearch the wiki for ACE00043 in Common Errors (https://www.azerothcore.org/wiki/common-errors)."); + WPFatal(isSupportClientDB, "AzerothCore does not support MySQL versions below 5.7 and MariaDB 10.5\nSearch the wiki for ACE00043 in Common Errors (https://www.azerothcore.org/wiki/common-errors)."); WPFatal(isSameClientDB, "Used MySQL library version (%s id %lu) does not match the version id used to compile AzerothCore (id %u).\nSearch the wiki for ACE00046 in Common Errors (https://www.azerothcore.org/wiki/common-errors).", mysql_get_client_info(), mysql_get_client_version(), MYSQL_VERSION_ID); } @@ -402,7 +402,7 @@ uint32 DatabaseWorkerPool::OpenConnections(InternalIndex type, uint8 numConne } else if (connection->GetServerVersion() < MIN_MYSQL_SERVER_VERSION) { - LOG_ERROR("sql.driver", "AzerothCore does not support MySQL versions below 5.7"); + LOG_ERROR("sql.driver", "AzerothCore does not support MySQL versions below 5.7 or MariaDB versions below 10.5"); return 1; } else