server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added MySql 8.0 support, see notes

Browse Source 
Notes:
MySql 8.0 MUST BE INSTALLED with LEGACY SECURITY
- If you use the default 'new' security model, it will not work
This commit is contained in:
Antz 2018-05-01 18:04:28 +01:00 committed by Antz
parent bcab12ecbc
commit eaeb3ec213
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/FindMySQL.cmake
View File

@ -31,6 +31,8 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.5/include" "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.5/include"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.6/include" "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.6/include"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.7/include" "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.7/include"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 8.0/include"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 8.1/include"
"${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.0/include/mysql" "${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.0/include/mysql"
"${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.1/include/mysql" "${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.1/include/mysql"
"${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.2/include/mysql" "${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.2/include/mysql"
@ -48,6 +50,8 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.5/lib" "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.5/lib"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.6/lib" "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.6/lib"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.7/lib" "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.7/lib"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 8.0/lib"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 8.1/lib"
"${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.0/lib" "${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.0/lib"
"${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.1/lib" "${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.1/lib"
"${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.2/lib" "${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.2/lib"

4
src/shared/Database/DatabaseMysql.cpp
View File

@ -434,7 +434,7 @@ void MySqlPreparedStatement::addParam(unsigned int nIndex, const SqlStmtFieldDat
MYSQL_BIND& pData = m_pInputArgs[nIndex]; MYSQL_BIND& pData = m_pInputArgs[nIndex];
my_bool bUnsigned = 0; bool bUnsigned = 0;
enum_field_types dataType = ToMySQLType(data, bUnsigned); enum_field_types dataType = ToMySQLType(data, bUnsigned);
// setup MYSQL_BIND structure // setup MYSQL_BIND structure
@ -479,7 +479,7 @@ bool MySqlPreparedStatement::execute()
return true; return true;
} }
enum_field_types MySqlPreparedStatement::ToMySQLType(const SqlStmtFieldData& data, my_bool& bUnsigned) enum_field_types MySqlPreparedStatement::ToMySQLType(const SqlStmtFieldData& data, bool& bUnsigned)
{ {
bUnsigned = 0; bUnsigned = 0;
enum_field_types dataType = MYSQL_TYPE_NULL; enum_field_types dataType = MYSQL_TYPE_NULL;

2
src/shared/Database/DatabaseMysql.h
View File

@ -96,7 +96,7 @@ class MySqlPreparedStatement : public SqlPreparedStatement
* @param bUnsigned * @param bUnsigned
* @return enum_field_types * @return enum_field_types
*/ */
static enum_field_types ToMySQLType(const SqlStmtFieldData& data, my_bool& bUnsigned); static enum_field_types ToMySQLType(const SqlStmtFieldData& data, bool& bUnsigned);
private: private:
/** /**

2
win

@ -1 +1 @@
Subproject commit 73319c4526b2f905b11b4853ec48a4e007661cf7 Subproject commit e5ba634cdf9e5c9c0d4b76b0289c7b4e31b51533