summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt/qtsql/files')
-rw-r--r--dev-qt/qtsql/files/qtsql-4.8.7-mysql-8.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/dev-qt/qtsql/files/qtsql-4.8.7-mysql-8.patch b/dev-qt/qtsql/files/qtsql-4.8.7-mysql-8.patch
new file mode 100644
index 00000000..06906f62
--- /dev/null
+++ b/dev-qt/qtsql/files/qtsql-4.8.7-mysql-8.patch
@@ -0,0 +1,47 @@
+--- a/src/sql/drivers/mysql/qsql_mysql.cpp 2021-03-06 21:08:28.617727309 +0500
++++ b/src/sql/drivers/mysql/qsql_mysql.cpp 2021-03-06 21:09:01.930877838 +0500
+@@ -194,7 +194,7 @@
+ myField(0), type(QVariant::Invalid)
+ {}
+ char *outField;
+- my_bool nullIndicator;
++ bool nullIndicator;
+ ulong bufLength;
+ MYSQL_FIELD *myField;
+ QVariant::Type type;
+@@ -930,7 +930,7 @@
+ MYSQL_BIND* currBind;
+ QVector<MYSQL_TIME *> timeVector;
+ QVector<QByteArray> stringVector;
+- QVector<my_bool> nullVector;
++ QVector<bool> nullVector;
+
+ const QVector<QVariant> values = boundValues();
+
+@@ -951,7 +951,7 @@
+
+ currBind = &d->outBinds[i];
+
+- nullVector[i] = static_cast<my_bool>(val.isNull());
++ nullVector[i] = static_cast<bool>(val.isNull());
+ currBind->is_null = &nullVector[i];
+ currBind->length = 0;
+ currBind->is_unsigned = 0;
+@@ -1048,7 +1048,7 @@
+ d->rowsAffected = mysql_stmt_affected_rows(d->stmt);
+
+ if (isSelect()) {
+- my_bool update_max_length = true;
++ bool update_max_length = true;
+
+ r = mysql_stmt_bind_result(d->stmt, d->inBinds);
+ if (r != 0) {
+@@ -1245,7 +1245,7 @@
+ const QStringList opts(connOpts.split(QLatin1Char(';'), QString::SkipEmptyParts));
+ QString unixSocket;
+ #if MYSQL_VERSION_ID >= 50000
+- my_bool reconnect=false;
++ bool reconnect=false;
+ #endif
+
+ // extract the real options from the string