diff options
| author | kvolk2git <78740198+kvolk2git@users.noreply.github.com> | 2021-11-21 01:03:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-20 23:03:20 +0100 |
| commit | 57617e215b2f45ba1636e0002714792326c3e57c (patch) | |
| tree | 3235597c640a5b8a0278dfd5a91f16bed2af041f | |
| parent | 126915ee065ebb80d7c32345936614791a81bb9e (diff) | |
Core/DBUpdater: Fixed db auto updater for mysql 8 when ssl connections are enabled (#27298)
| -rw-r--r-- | src/server/database/Updater/DBUpdater.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/server/database/Updater/DBUpdater.cpp b/src/server/database/Updater/DBUpdater.cpp index bf283cf640f..3c4d52a2639 100644 --- a/src/server/database/Updater/DBUpdater.cpp +++ b/src/server/database/Updater/DBUpdater.cpp @@ -370,9 +370,18 @@ void DBUpdater<T>::ApplyFile(DatabaseWorkerPool<T>& 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); |