diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2018-06-01 22:16:41 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2018-06-01 22:16:41 +0000 |
| commit | b9647c3370beb69459d370aff159851f2e807c0f (patch) | |
| tree | 1fb4b601c1a450a247908ede68ac53479dd1a4b5 /databases/qt5-sqldrivers-mysql | |
| parent | ab5210f409a450940561fabde548387b347fd8e1 (diff) | |
| download | ports-b9647c3370beb69459d370aff159851f2e807c0f.tar.gz ports-b9647c3370beb69459d370aff159851f2e807c0f.zip | |
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
Notes
Notes:
svn path=/head/; revision=471301
Diffstat (limited to 'databases/qt5-sqldrivers-mysql')
| -rw-r--r-- | databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |