diff options
| -rw-r--r-- | src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index 7d945f23fc..3092a7f772 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -872,7 +872,6 @@ bool QMYSQLResult::exec() return false; int r = 0; - MYSQL_BIND* currBind; QList<MYSQL_TIME *> timeVector; QList<QByteArray> stringVector; QList<my_bool> nullVector; @@ -894,7 +893,7 @@ bool QMYSQLResult::exec() const QVariant &val = boundValues().at(i); void *data = const_cast<void *>(val.constData()); - currBind = &d->outBinds[i]; + MYSQL_BIND* currBind = &d->outBinds[i]; nullVector[i] = static_cast<my_bool>(val.isNull()); currBind->is_null = &nullVector[i]; diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp index 4f70728d73..2914fac3e7 100644 --- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp +++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp @@ -249,8 +249,6 @@ void QSQLiteResultPrivate::initColumns(bool emptyResultset) bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int idx, bool initialFetch) { Q_Q(QSQLiteResult); - int res; - int i; if (skipRow) { // already fetched @@ -273,8 +271,7 @@ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int i q->setAt(QSql::AfterLastRow); return false; } - res = sqlite3_step(stmt); - + int res = sqlite3_step(stmt); switch(res) { case SQLITE_ROW: // check to see if should fill out columns @@ -283,7 +280,7 @@ bool QSQLiteResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int i initColumns(false); if (idx < 0 && !initialFetch) return true; - for (i = 0; i < rInf.count(); ++i) { + for (int i = 0; i < rInf.count(); ++i) { switch (sqlite3_column_type(stmt, i)) { case SQLITE_BLOB: values[i + idx] = QByteArray(static_cast<const char *>( |