summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-09-07 04:25:33 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-09-07 04:25:33 (GMT)
commit8a6f4436477d39aa3e26a935922ece5c7ae1a9ad (patch)
treec6b661e50f5f9d50aa80f5b180e0d7a5df201e2f /src
parent252a61de1dda0cb315968875288ff5f2d730621c (diff)
parent40914d716690bda5733bd2f69bd74e9837a6e159 (diff)
downloadQt-8a6f4436477d39aa3e26a935922ece5c7ae1a9ad.zip
Qt-8a6f4436477d39aa3e26a935922ece5c7ae1a9ad.tar.gz
Qt-8a6f4436477d39aa3e26a935922ece5c7ae1a9ad.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
-rw-r--r--src/sql/drivers/db2/qsql_db2.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sql/drivers/db2/qsql_db2.cpp b/src/sql/drivers/db2/qsql_db2.cpp
index 6187e6b..7bbe122 100644
--- a/src/sql/drivers/db2/qsql_db2.cpp
+++ b/src/sql/drivers/db2/qsql_db2.cpp
@@ -908,8 +908,9 @@ bool QDB2Result::fetchFirst()
SQL_FETCH_FIRST,
0);
if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) {
- setLastError(qMakeError(QCoreApplication::translate("QDB2Result", "Unable to fetch first"),
- QSqlError::StatementError, d));
+ if(r!= SQL_NO_DATA)
+ setLastError(qMakeError(QCoreApplication::translate("QDB2Result", "Unable to fetch first"),
+ QSqlError::StatementError, d));
return false;
}
setAt(0);