products/patches/qt_mysql_UB20.patch

   1 --- qt/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp       2017-06-28 11:54:29.000000000 +0200
   2 +++ qt_new/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp   2022-03-31 16:11:26.861381738 +0200
   3 @@ -232,7 +232,7 @@
   4                myField(0), type(QVariant::Invalid)
   5          {}
   6          char *outField;
   7 -        my_bool nullIndicator;
   8 +        bool nullIndicator;
   9          ulong bufLength;
  10          MYSQL_FIELD *myField;
  11          QVariant::Type type;
  12 @@ -983,7 +983,7 @@
  13      MYSQL_BIND* currBind;
  14      QVector<MYSQL_TIME *> timeVector;
  15      QVector<QByteArray> stringVector;
  16 -    QVector<my_bool> nullVector;
  17 +    QVector<bool> nullVector;
  18
  19      const QVector<QVariant> values = boundValues();
  20
  21 @@ -1004,7 +1004,7 @@
  22
  23              currBind = &d->outBinds[i];
  24
  25 -            nullVector[i] = static_cast<my_bool>(val.isNull());
  26 +            nullVector[i] = static_cast<bool>(val.isNull());
  27              currBind->is_null = &nullVector[i];
  28              currBind->length = 0;
  29              currBind->is_unsigned = 0;
  30 @@ -1101,7 +1101,7 @@
  31      d->rowsAffected = mysql_stmt_affected_rows(d->stmt);
  32
  33      if (isSelect()) {
  34 -        my_bool update_max_length = true;
  35 +        bool update_max_length = true;
  36
  37          r = mysql_stmt_bind_result(d->stmt, d->inBinds);
  38          if (r != 0) {
  39 @@ -1306,7 +1306,7 @@
  40      QString sslCAPath;
  41      QString sslCipher;
  42  #if MYSQL_VERSION_ID >= 50000
  43 -    my_bool reconnect=false;
  44 +    bool reconnect=false;
  45      uint connectTimeout = 0;
  46      uint readTimeout = 0;
  47      uint writeTimeout = 0;