diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-12-01 07:42:46 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-12-01 07:42:46 (GMT) |
| commit | d8548a8e4696512c5e7796b866ed98a7bd52f673 (patch) | |
| tree | cd70d093e4ee24ab27b9fecfa8ad77449d1794c9 /src/sql/drivers/mysql/qsql_mysql.cpp | |
| parent | 182efb3d2c5182a89d7416f474811309d7939786 (diff) | |
| parent | 700a069591d29733609e619c224861ca774bfb32 (diff) | |
| download | Qt-d8548a8e4696512c5e7796b866ed98a7bd52f673.zip Qt-d8548a8e4696512c5e7796b866ed98a7bd52f673.tar.gz Qt-d8548a8e4696512c5e7796b866ed98a7bd52f673.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/sql/drivers/mysql/qsql_mysql.cpp')
| -rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index f368d1d..b74babc 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -509,15 +509,24 @@ bool QMYSQLResult::fetchNext() return false; if (d->preparedQuery) { #if MYSQL_VERSION_ID >= 40108 - if (mysql_stmt_fetch(d->stmt)) + int nRC = mysql_stmt_fetch(d->stmt); + if (nRC) { +#ifdef MYSQL_DATA_TRUNCATED + if (nRC == 1 || nRC == MYSQL_DATA_TRUNCATED) +#else + if (nRC == 1) +#endif // MYSQL_DATA_TRUNCATED + setLastError(qMakeStmtError(QCoreApplication::translate("QMYSQLResult", + "Unable to fetch data"), QSqlError::StatementError, d->stmt)); return false; + } #else return false; #endif } else { - d->row = mysql_fetch_row(d->result); - if (!d->row) - return false; + d->row = mysql_fetch_row(d->result); + if (!d->row) + return false; } setAt(at() + 1); return true; @@ -1365,7 +1374,6 @@ QStringList QMYSQLDriver::tables(QSql::TableType type) const QSqlIndex QMYSQLDriver::primaryIndex(const QString& tablename) const { QSqlIndex idx; - bool prepQ; if (!isOpen()) return idx; |