From b9647c3370beb69459d370aff159851f2e807c0f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 1 Jun 2018 22:16:41 +0000 Subject: Fix build of the Qt SQL plugins for MySQL against MariaDB 10. Recent MySQL code has deprecated the my_bool type, so r469165 added a check for that recent version. MariaDB pretends to be MySQL, and has an even newer version, which nonetheless hasn't taken over the drop-my_bool-type change. So my_bool still exists there. Assume, for now, that MariaDB has my_bool regardless, to fix incompatibilities reported after PR227813 was closed. PR: 227813 Reported by: Jashank Jeremy --- .../files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'databases/qt5-sqldrivers-mysql') diff --git a/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp b/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp index 224d0b0b7661..534d989c4ff4 100644 --- a/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp +++ b/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp @@ -18,7 +18,7 @@ now requires a C++ or C99 compiler to compile. +// MYSQL 8.0.1 no longer uses the my_bool type: +// https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html -+#if MYSQL_VERSION_ID >= 80001 ++#if (MYSQL_VERSION_ID >= 80001) && !defined(MARIADB_BASE_VERSION) +typedef bool mysql_bool; +#else +typedef my_bool mysql_bool; -- cgit v1.2.3