From 8ea9f1e02e85e3cc2b4ccda52639e96651d21653 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 17 Feb 2020 06:03:43 +0000 Subject: Mon Feb 17 06:03:43 UTC 2020 ap/ksh93-20200131_e4fea8c5-x86_64-1.txz: Upgraded. ap/zsh-5.8-x86_64-1.txz: Upgraded. l/brotli-1.0.7-x86_64-1.txz: Added. l/gmime-3.2.6-x86_64-1.txz: Upgraded. l/hyphen-2.8.8-x86_64-1.txz: Added. l/openal-soft-1.20.1-x86_64-1.txz: Upgraded. Thanks to Skaendo and Willy Sudiarto Raharjo. l/qt5-webkit-5.212.0_alpha3-x86_64-1.txz: Added. Thanks to alienBOB. l/woff2-20180531_a0d0ed7-x86_64-1.txz: Added. n/bluez-5.53-x86_64-1.txz: Upgraded. n/mutt-1.13.4-x86_64-1.txz: Upgraded. n/samba-4.11.6-x86_64-3.txz: Rebuilt. n/socat-1.7.3.4-x86_64-1.txz: Added. n/whois-5.5.6-x86_64-1.txz: Upgraded. testing/packages/PAM/samba-4.11.6-x86_64-3_pam.txz: Rebuilt. Added patches to fix joining a DC when using krb5. Looks like the patches are already upstreamed in the latest 4.12.0-rc. Thanks to camerabambai. --- source/l/qt5/patches/qt5.qtbug-53237.patch | 90 ------------------------------ 1 file changed, 90 deletions(-) delete mode 100644 source/l/qt5/patches/qt5.qtbug-53237.patch (limited to 'source/l/qt5/patches/qt5.qtbug-53237.patch') diff --git a/source/l/qt5/patches/qt5.qtbug-53237.patch b/source/l/qt5/patches/qt5.qtbug-53237.patch deleted file mode 100644 index c6d5739d5..000000000 --- a/source/l/qt5/patches/qt5.qtbug-53237.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 8e889378115c69508b050a511621ac8e30ec4158 Mon Sep 17 00:00:00 2001 -From: Jesus Fernandez -Date: Mon, 13 Jun 2016 19:09:15 +0200 -Subject: [PATCH] Fix UNSIGNED values in QMYSQL - -The unsigned flag in columns was ignored when creating the list of -bound values in a mysql table. So the result iteration with -QSqlQuery::next stops after the first wrong truncated value. - -[ChangeLog][QtSql] Fixed QSqlQuery::prepare value truncation error when -using UNSIGNED values in a MySQL database. - -Task-number: QTBUG-53969 -Task-number: QTBUG-53237 -Change-Id: I10d977993445f2794f1dd8c88b2e83517ef524f3 -Reviewed-by: Milian Wolff ---- - src/sql/drivers/mysql/qsql_mysql.cpp | 1 + - tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 39 +++++++++++++++++++++++ - 2 files changed, 40 insertions(+) - -diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp -index 96bdcc4..55bf499 100644 ---- a/src/sql/drivers/mysql/qsql_mysql.cpp -+++ b/src/sql/drivers/mysql/qsql_mysql.cpp -@@ -387,6 +387,7 @@ bool QMYSQLResultPrivate::bindInValues() - bind->buffer_length = f.bufLength = fieldInfo->length + 1; - bind->is_null = &f.nullIndicator; - bind->length = &f.bufLength; -+ bind->is_unsigned = fieldInfo->flags & UNSIGNED_FLAG ? 1 : 0; - f.outField=field; - - ++i; -diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp -index bd553d5..f1c4333 100644 ---- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp -+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp -@@ -233,6 +233,9 @@ private slots: - void QTBUG_36211_data() { generic_data("QPSQL"); } - void QTBUG_36211(); - -+ void QTBUG_53969_data() { generic_data("QMYSQL"); } -+ void QTBUG_53969(); -+ - void sqlite_constraint_data() { generic_data("QSQLITE"); } - void sqlite_constraint(); - -@@ -3652,6 +3655,42 @@ void tst_QSqlQuery::QTBUG_36211() - } - } - -+void tst_QSqlQuery::QTBUG_53969() -+{ -+ QFETCH( QString, dbName ); -+ QVector values = QVector() << 10 << 20 << 127 << 128 << 1, tableValues; -+ QSqlDatabase db = QSqlDatabase::database( dbName ); -+ CHECK_DATABASE( db ); -+ tableValues.reserve(values.size()); -+ if (tst_Databases::getDatabaseType(db) == QSqlDriver::MySqlServer) { -+ const QString tableName(qTableName("bug53969", __FILE__, db)); -+ tst_Databases::safeDropTable( db, tableName ); -+ -+ QSqlQuery q(db); -+ QVERIFY_SQL(q, exec(QString("CREATE TABLE %1 (id INT AUTO_INCREMENT PRIMARY KEY, " -+ "test_number TINYINT(3) UNSIGNED)") -+ .arg(tableName))); -+ -+ QVERIFY_SQL(q, prepare("INSERT INTO " + tableName + " (test_number) VALUES (:value)")); -+ -+ QVector::iterator begin = values.begin(), end = values.end(), it; -+ for (it = begin; it != end; ++it) { -+ q.bindValue(":value", *it); -+ QVERIFY_SQL(q, exec()); -+ } -+ -+ QVERIFY_SQL(q, prepare("SELECT test_number FROM " + tableName)); -+ QVERIFY_SQL(q, exec()); -+ -+ while (q.next()) { -+ bool ok; -+ tableValues.push_back(q.value(0).toUInt(&ok)); -+ QVERIFY(ok); -+ } -+ QCOMPARE(values, tableValues); -+ } -+} -+ - void tst_QSqlQuery::oraOCINumber() - { - QFETCH( QString, dbName ); -- cgit v1.2.3-65-gdbad