From 077a36ead14589f7a707e50ba1c3bf7611142f38 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Fri, 26 Nov 2021 13:10:34 +0100 Subject: [PATCH] fix(Core/DBUpdater): MySQL 8.0 + SSL support (#9340) * cherry-pick commit (https://github.com/TrinityCore/TrinityCore/commit/57617e215b2f45ba1636e0002714792326c3e57c) Co-Authored-By: kvolk2git <78740198+kvolk2git@users.noreply.github.com> Co-authored-by: kvolk2git <78740198+kvolk2git@users.noreply.github.com> --- src/server/database/Updater/DBUpdater.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/server/database/Updater/DBUpdater.cpp b/src/server/database/Updater/DBUpdater.cpp index 298f2404c..2c32c6b86 100644 --- a/src/server/database/Updater/DBUpdater.cpp +++ b/src/server/database/Updater/DBUpdater.cpp @@ -478,9 +478,18 @@ void DBUpdater::ApplyFile(DatabaseWorkerPool& pool, std::string const& hos // Set max allowed packet to 1 GB args.emplace_back("--max-allowed-packet=1GB"); +#if !defined(MARIADB_VERSION_ID) && MYSQL_VERSION_ID >= 80000 + + if (ssl == "ssl") + args.emplace_back("--ssl-mode=REQUIRED"); + +#else + if (ssl == "ssl") args.emplace_back("--ssl"); +#endif + // Database if (!database.empty()) args.emplace_back(database);