diff options
| -rw-r--r-- | conf/dist/config.sh | 2 | ||||
| -rw-r--r-- | src/cmake/macros/FindMySQL.cmake | 8 | ||||
| -rw-r--r-- | src/common/Database/DatabaseWorkerPool.cpp | 8 |
3 files changed, 5 insertions, 13 deletions
diff --git a/conf/dist/config.sh b/conf/dist/config.sh index 6057018ed0..e241803d22 100644 --- a/conf/dist/config.sh +++ b/conf/dist/config.sh @@ -152,7 +152,7 @@ DB_SKIP_BASE_IMPORT_IF_EXISTS=true # # Example: -# "C:/Program Files/MySQL/MySQL Server 5.6/bin/mysql.exe" +# "C:/Program Files/MySQL/MySQL Server 8.0/bin/mysql.exe" # "/usr/bin/mysql" # "mysql" # diff --git a/src/cmake/macros/FindMySQL.cmake b/src/cmake/macros/FindMySQL.cmake index cdb466b491..6ad9312391 100644 --- a/src/cmake/macros/FindMySQL.cmake +++ b/src/cmake/macros/FindMySQL.cmake @@ -145,15 +145,12 @@ find_path(MYSQL_INCLUDE_DIR /usr/local/mysql/include "C:/Program Files/MySQL/MySQL Server 8.0/include" "C:/Program Files/MySQL/MySQL Server 5.7/include" - "C:/Program Files/MySQL/MySQL Server 5.6/include" "C:/Program Files/MySQL/include" "C:/MySQL/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.0;Location]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.0;Location]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/include" "$ENV{ProgramFiles}/MySQL/*/include" "$ENV{SystemDrive}/MySQL/*/include" "c:/msys/local/include" @@ -187,21 +184,16 @@ if( WIN32 ) "C:/Program Files/MySQL/MySQL Server 8.0/lib" "C:/Program Files/MySQL/MySQL Server 8.0/lib/opt" "C:/Program Files/MySQL/MySQL Server 5.7/lib/opt" - "C:/Program Files/MySQL/MySQL Server 5.6/lib/opt" "C:/Program Files/MySQL/lib" "C:/MySQL/lib/debug" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.0;Location]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.0;Location]/lib/opt" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.0;Location]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.0;Location]/lib/opt" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/lib/opt" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt" "$ENV{ProgramFiles}/MySQL/*/lib/opt" "$ENV{SystemDrive}/MySQL/*/lib/opt" "c:/msys/local/include" diff --git a/src/common/Database/DatabaseWorkerPool.cpp b/src/common/Database/DatabaseWorkerPool.cpp index 8e7c822172..95f32a875c 100644 --- a/src/common/Database/DatabaseWorkerPool.cpp +++ b/src/common/Database/DatabaseWorkerPool.cpp @@ -7,8 +7,8 @@ #include "DatabaseWorkerPool.h" #include "DatabaseEnv.h" -#define MIN_MYSQL_SERVER_VERSION 50600u -#define MIN_MYSQL_CLIENT_VERSION 50600u +#define MIN_MYSQL_SERVER_VERSION 50700u +#define MIN_MYSQL_CLIENT_VERSION 50700u template <class T> DatabaseWorkerPool<T>::DatabaseWorkerPool() : _mqueue(new ACE_Message_Queue<ACE_SYNCH>(2 * 1024 * 1024, 2 * 1024 * 1024)), @@ -18,7 +18,7 @@ template <class T> DatabaseWorkerPool<T>::DatabaseWorkerPool() : _connections.resize(IDX_SIZE); WPFatal(mysql_thread_safe(), "Used MySQL library isn't thread-safe."); - WPFatal(mysql_get_client_version() >= MIN_MYSQL_CLIENT_VERSION, "AzerothCore does not support MySQL versions below 5.6"); + WPFatal(mysql_get_client_version() >= MIN_MYSQL_CLIENT_VERSION, "AzerothCore does not support MySQL versions below 5.7"); } template <class T> @@ -37,7 +37,7 @@ bool DatabaseWorkerPool<T>::Open(const std::string& infoString, uint8 async_thre T* t = new T(_queue, _connectionInfo); res &= t->Open(); if (res) // only check mysql version if connection is valid - WPFatal(mysql_get_server_version(t->GetHandle()) >= MIN_MYSQL_SERVER_VERSION, "AzerothCore does not support MySQL versions below 5.6"); + WPFatal(mysql_get_server_version(t->GetHandle()) >= MIN_MYSQL_SERVER_VERSION, "AzerothCore does not support MySQL versions below 5.7"); _connections[IDX_ASYNC][i] = t; ++_connectionCount[IDX_ASYNC]; |