mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
7cde3ca9e7
a/kernel-generic-5.4.20-x86_64-1.txz: Upgraded.
a/kernel-huge-5.4.20-x86_64-1.txz: Upgraded.
a/kernel-modules-5.4.20-x86_64-1.txz: Upgraded.
a/shadow-4.8.1-x86_64-3.txz: Rebuilt.
a/util-linux-2.35.1-x86_64-3.txz: Rebuilt.
d/kernel-headers-5.4.20-x86-1.txz: Upgraded.
k/kernel-source-5.4.20-noarch-1.txz: Upgraded.
l/ConsoleKit2-1.2.1-x86_64-2.txz: Rebuilt.
l/dconf-editor-3.34.4-x86_64-1.txz: Upgraded.
l/libxkbcommon-0.10.0-x86_64-1.txz: Added.
l/openal-soft-1.19.1-x86_64-1.txz: Added.
l/qt5-5.13.2-x86_64-1.txz: Added.
Thanks to alienBOB.
n/openssh-8.2p1-x86_64-1.txz: Upgraded.
Potentially incompatible changes:
* ssh(1), sshd(8): the removal of "ssh-rsa" from the accepted
CASignatureAlgorithms list.
* ssh(1), sshd(8): this release removes diffie-hellman-group14-sha1
from the default key exchange proposal for both the client and
server.
* ssh-keygen(1): the command-line options related to the generation
and screening of safe prime numbers used by the
diffie-hellman-group-exchange-* key exchange algorithms have
changed. Most options have been folded under the -O flag.
* sshd(8): the sshd listener process title visible to ps(1) has
changed to include information about the number of connections that
are currently attempting authentication and the limits configured
by MaxStartups.
x/mesa-19.3.4-x86_64-2.txz: Rebuilt.
Reverted "[PATCH] swr: Fix GCC 4.9 checks." which makes X fail to start with
an illegal instruction on some hardware.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
testing/packages/PAM/ConsoleKit2-1.2.1-x86_64-2_pam.txz: Rebuilt.
Rebuilt with --disable-libcgmanager to fix setting limits on PAM.
Thanks to gattocarlo.
testing/packages/PAM/openssh-8.2p1-x86_64-1_pam.txz: Upgraded.
testing/packages/PAM/shadow-4.8.1-x86_64-3_pam.txz: Rebuilt.
Moved some of the /etc/pam.d/ file to the util-linux package where they
more properly belong.
testing/packages/PAM/util-linux-2.35.1-x86_64-3_pam.txz: Rebuilt.
Added some /etc/pam.d/ files previously in the shadow package.
Changed /etc/pam.d/{chfn,chsh} and made chfn/chsh setuid root to fix them.
Added /etc/pam.d/{runuser,runuser-l}.
usb-and-pxe-installers/usbboot.img: Rebuilt.
90 lines
3.3 KiB
Diff
90 lines
3.3 KiB
Diff
From 8e889378115c69508b050a511621ac8e30ec4158 Mon Sep 17 00:00:00 2001
|
|
From: Jesus Fernandez <jesus.fernandez@theqtcompany.com>
|
|
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 <milian.wolff@kdab.com>
|
|
---
|
|
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<int> values = QVector<int>() << 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<int>::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 );
|