3rdparty/ext_qt/qsql_mysql.diff

0001 diff -ruN qt-everywhere-src-5.11.2.orig/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp qt-everywhere-src-5.11.2/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
0002 --- qt-everywhere-src-5.11.2.orig/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp    2018-09-13 06:25:10.000000000 +0200
0003 +++ qt-everywhere-src-5.11.2/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp 2018-10-09 16:50:41.225559140 +0200
0004 @@ -74,6 +74,14 @@
0005  #  define Q_CLIENT_MULTI_STATEMENTS 0
0006  #endif
0007
0008 +// MYSQL 8.0.1 no longer uses the my_bool type:
0009 +// https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html
0010 +#if MYSQL_VERSION_ID >= 80001
0011 +typedef bool mysql_bool;
0012 +#else
0013 +typedef my_bool mysql_bool;
0014 +#endif
0015 +
0016  QT_BEGIN_NAMESPACE
0017
0018  class QMYSQLDriverPrivate : public QSqlDriverPrivate
0019 @@ -232,7 +240,7 @@
0020                myField(0), type(QVariant::Invalid)
0021          {}
0022          char *outField;
0023 -        my_bool nullIndicator;
0024 +        mysql_bool nullIndicator;
0025          ulong bufLength;
0026          MYSQL_FIELD *myField;
0027          QVariant::Type type;
0028 @@ -984,7 +992,7 @@
0029      MYSQL_BIND* currBind;
0030      QVector<MYSQL_TIME *> timeVector;
0031      QVector<QByteArray> stringVector;
0032 -    QVector<my_bool> nullVector;
0033 +    QVector<mysql_bool> nullVector;
0034
0035      const QVector<QVariant> values = boundValues();
0036
0037 @@ -1005,7 +1013,7 @@
0038
0039              currBind = &d->outBinds[i];
0040
0041 -            nullVector[i] = static_cast<my_bool>(val.isNull());
0042 +            nullVector[i] = static_cast<mysql_bool>(val.isNull());
0043              currBind->is_null = &nullVector[i];
0044              currBind->length = 0;
0045              currBind->is_unsigned = 0;
0046 @@ -1102,7 +1110,7 @@
0047      d->rowsAffected = mysql_stmt_affected_rows(d->stmt);
0048
0049      if (isSelect()) {
0050 -        my_bool update_max_length = true;
0051 +        mysql_bool update_max_length = true;
0052
0053          r = mysql_stmt_bind_result(d->stmt, d->inBinds);
0054          if (r != 0) {
0055 @@ -1313,7 +1321,7 @@
0056      QString sslCAPath;
0057      QString sslCipher;
0058  #if MYSQL_VERSION_ID >= 50000
0059 -    my_bool reconnect=false;
0060 +    mysql_bool reconnect=false;
0061      uint connectTimeout = 0;
0062      uint readTimeout = 0;
0063      uint writeTimeout = 0;