Commit 278a7fb2 authored by Thibaut ROMAIN's avatar Thibaut ROMAIN
Browse files

ENH: Remove a patch for QT5 that has been integrated upstream

parent 8c1fe57e
Pipeline #8553 canceled with stages
in 19 minutes and 8 seconds
diff -burN QT5-orig/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp QT5/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
--- QT5-orig/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp 2021-08-09 12:31:58.683361911 +0200
+++ QT5/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp 2021-08-09 12:50:06.263308909 +0200
@@ -76,6 +76,11 @@
# define Q_CLIENT_MULTI_STATEMENTS 0
#endif
+// Commit 818ab021f5fbeeddaed001efd8716907e735bd71 from QT, integrated in QT 5.12
+// MySQL above version 8 removed my_bool typedef while MariaDB kept it,
+// by redefining it we can regain source compatibility.
+using my_bool = decltype(mysql_stmt_bind_result(nullptr, nullptr));
+
QT_BEGIN_NAMESPACE
class QMYSQLDriverPrivate : public QSqlDriverPrivate
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment