diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-26 08:29:27 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-26 08:29:27 (GMT) |
| commit | e9e2baccfcfc48926414b0f18885140312470cae (patch) | |
| tree | 289fd7825c7d4efc67fabfbee1a4b6d363c544b8 /src/sql | |
| parent | 7484a16ffeaf2c7640fc35b424a66cdd8695841c (diff) | |
| parent | 7278c142089d46946d1ad2558eae949220dfe0c4 (diff) | |
| download | Qt-e9e2baccfcfc48926414b0f18885140312470cae.zip Qt-e9e2baccfcfc48926414b0f18885140312470cae.tar.gz Qt-e9e2baccfcfc48926414b0f18885140312470cae.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/drivers/ibase/qsql_ibase.cpp | 4 | ||||
| -rw-r--r-- | src/sql/drivers/psql/qsql_psql.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp index 893c98c..0c4fff0 100644 --- a/src/sql/drivers/ibase/qsql_ibase.cpp +++ b/src/sql/drivers/ibase/qsql_ibase.cpp @@ -157,8 +157,8 @@ static void delDA(XSQLDA *&sqlda) if (!sqlda) return; for (int i = 0; i < sqlda->sqld; ++i) { - delete sqlda->sqlvar[i].sqlind; - delete sqlda->sqlvar[i].sqldata; + delete [] sqlda->sqlvar[i].sqlind; + delete [] sqlda->sqlvar[i].sqldata; } free(sqlda); sqlda = 0; diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp index d197388..0c92013 100644 --- a/src/sql/drivers/psql/qsql_psql.cpp +++ b/src/sql/drivers/psql/qsql_psql.cpp @@ -831,7 +831,7 @@ bool QPSQLDriver::commitTransaction() if (d->pro == QPSQLDriver::Version8 || d->pro == QPSQLDriver::Version81 || d->pro == QPSQLDriver::Version82) { - transaction_failed = QByteArray(PQcmdStatus(res)) == QByteArray("ROLLBACK")?true:false; + transaction_failed = qstrcmp(PQcmdStatus(res), "ROLLBACK") == 0; } if (!res || PQresultStatus(res) != PGRES_COMMAND_OK || transaction_failed) { |