Skip to content

Commit d07dc00

Browse files
committed
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
1 parent cd16d45 commit d07dc00

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

cmake/FindMySQL.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
3131
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.5/include"
3232
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.6/include"
3333
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.7/include"
34+
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 8.0/include"
35+
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 8.1/include"
3436
"${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.0/include/mysql"
3537
"${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.1/include/mysql"
3638
"${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.2/include/mysql"
@@ -48,6 +50,8 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
4850
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.5/lib"
4951
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.6/lib"
5052
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.7/lib"
53+
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 8.0/lib"
54+
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 8.1/lib"
5155
"${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.0/lib"
5256
"${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.1/lib"
5357
"${PROGRAM_FILES_ARCH_PATH}/MariaDB 10.2/lib"

src/shared/Database/DatabaseMysql.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ void MySqlPreparedStatement::addParam(unsigned int nIndex, const SqlStmtFieldDat
434434

435435
MYSQL_BIND& pData = m_pInputArgs[nIndex];
436436

437-
my_bool bUnsigned = 0;
437+
bool bUnsigned = 0;
438438
enum_field_types dataType = ToMySQLType(data, bUnsigned);
439439

440440
// setup MYSQL_BIND structure
@@ -479,7 +479,7 @@ bool MySqlPreparedStatement::execute()
479479
return true;
480480
}
481481

482-
enum_field_types MySqlPreparedStatement::ToMySQLType(const SqlStmtFieldData& data, my_bool& bUnsigned)
482+
enum_field_types MySqlPreparedStatement::ToMySQLType(const SqlStmtFieldData& data, bool& bUnsigned)
483483
{
484484
bUnsigned = 0;
485485
enum_field_types dataType = MYSQL_TYPE_NULL;

src/shared/Database/DatabaseMysql.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class MySqlPreparedStatement : public SqlPreparedStatement
9696
* @param bUnsigned
9797
* @return enum_field_types
9898
*/
99-
static enum_field_types ToMySQLType(const SqlStmtFieldData& data, my_bool& bUnsigned);
99+
static enum_field_types ToMySQLType(const SqlStmtFieldData& data, bool& bUnsigned);
100100

101101
private:
102102
/**

win

0 commit comments

Comments
 (0)