Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7

4 files changed, 14 insertions, 8 deletions

diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 81c2760f65..59ef42d609 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -1931,11 +1931,14 @@ bool QODBCDriver::open(const QString & db,
     if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) {
         qSqlWarning(QLatin1String("QODBCDriver::open: Unable to allocate connection"), d);
         setOpenError(true);
+        cleanup();
         return false;
     }
 
-    if (!d->setConnectionOptions(connOpts))
+    if (!d->setConnectionOptions(connOpts)) {
+        cleanup();
         return false;
+    }
 
     // Create the connection string
     QString connQStr;
@@ -1968,6 +1971,7 @@ bool QODBCDriver::open(const QString & db,
     if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) {
         setLastError(qMakeError(tr("Unable to connect"), QSqlError::ConnectionError, d));
         setOpenError(true);
+        cleanup();
         return false;
     }
 
@@ -1975,6 +1979,7 @@ bool QODBCDriver::open(const QString & db,
         setLastError(qMakeError(tr("Unable to connect - Driver doesn't support all "
                      "functionality required"), QSqlError::ConnectionError, d));
         setOpenError(true);
+        cleanup();
         return false;
     }
 
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index b75c9ee29c..fcf75af298 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -1421,8 +1421,10 @@ bool QPSQLDriver::subscribeToNotification(const QString &name)
         PGresult *result = d->exec(query);
         if (PQresultStatus(result) != PGRES_COMMAND_OK) {
             setLastError(qMakeError(tr("Unable to subscribe"), QSqlError::StatementError, d, result));
+            PQclear(result);
             return false;
         }
+        PQclear(result);
 
         if (!d->sn) {
             d->sn = new QSocketNotifier(socket, QSocketNotifier::Read);
@@ -1454,8 +1456,10 @@ bool QPSQLDriver::unsubscribeFromNotification(const QString &name)
     PGresult *result = d->exec(query);
     if (PQresultStatus(result) != PGRES_COMMAND_OK) {
         setLastError(qMakeError(tr("Unable to unsubscribe"), QSqlError::StatementError, d, result));
+        PQclear(result);
         return false;
     }
+    PQclear(result);
 
     d->seid.removeAll(name);
 
diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
index 46b0a356d3..67c24e4168 100644
--- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
@@ -144,8 +144,6 @@ public:
     QVector<QVariant> firstRow;
 };
 
-static const uint initial_cache_size = 128;
-
 QSQLite2ResultPrivate::QSQLite2ResultPrivate(QSQLite2Result *q, const QSQLite2Driver *drv)
     : QSqlCachedResultPrivate(q, drv),
       currentTail(0),
diff --git a/src/sql/sql.pro b/src/sql/sql.pro
index 10004cb445..218671d7e7 100644
--- a/src/sql/sql.pro
+++ b/src/sql/sql.pro
@@ -4,13 +4,8 @@ QT         = core-private
 DEFINES += QT_NO_USING_NAMESPACE
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000
 
-MODULE_PLUGIN_TYPES = \
-    sqldrivers
-
 QMAKE_DOCS = $$PWD/doc/qtsql.qdocconf
 
-load(qt_module)
-
 DEFINES += QT_NO_CAST_FROM_ASCII
 PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
 SQL_P = sql
@@ -18,3 +13,7 @@ SQL_P = sql
 include(kernel/kernel.pri)
 include(drivers/drivers.pri)
 include(models/models.pri)
+
+MODULE_PLUGIN_TYPES = \
+    sqldrivers
+load(qt_module)