From eaeb3ec213cc46c947eaeb2d688bbcaf13e2b26f Mon Sep 17 00:00:00 2001 From: Antz Date: Tue, 1 May 2018 18:04:28 +0100 Subject: [PATCH] Added MySql 8.0 support, see notes Notes: MySql 8.0 MUST BE INSTALLED with LEGACY SECURITY - If you use the default 'new' security model, it will not work --- cmake/FindMySQL.cmake | 4 ++++ src/shared/Database/DatabaseMysql.cpp | 4 ++-- src/shared/Database/DatabaseMysql.h | 2 +- win | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index b87e5ca6..887a154d 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -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.6/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.1/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.6/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.1/lib" "${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.2/lib" diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp index 3590ce07..a26e7b55 100644 --- a/src/shared/Database/DatabaseMysql.cpp +++ b/src/shared/Database/DatabaseMysql.cpp @@ -434,7 +434,7 @@ void MySqlPreparedStatement::addParam(unsigned int nIndex, const SqlStmtFieldDat MYSQL_BIND& pData = m_pInputArgs[nIndex]; - my_bool bUnsigned = 0; + bool bUnsigned = 0; enum_field_types dataType = ToMySQLType(data, bUnsigned); // setup MYSQL_BIND structure @@ -479,7 +479,7 @@ bool MySqlPreparedStatement::execute() 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; enum_field_types dataType = MYSQL_TYPE_NULL; diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h index efc97cdf..e38450bb 100644 --- a/src/shared/Database/DatabaseMysql.h +++ b/src/shared/Database/DatabaseMysql.h @@ -96,7 +96,7 @@ class MySqlPreparedStatement : public SqlPreparedStatement * @param bUnsigned * @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: /** diff --git a/win b/win index 73319c45..e5ba634c 160000 --- a/win +++ b/win @@ -1 +1 @@ -Subproject commit 73319c4526b2f905b11b4853ec48a4e007661cf7 +Subproject commit e5ba634cdf9e5c9c0d4b76b0289c7b4e31b51533