Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	src/corelib/io/qfile.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp

2 files changed, 12 insertions, 3 deletions

diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 51fc306..53645c9 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -927,6 +927,7 @@ bool QMYSQLResult::exec()
             nullVector[i] = static_cast<my_bool>(val.isNull());
             currBind->is_null = &nullVector[i];
             currBind->length = 0;
+            currBind->is_unsigned = 0;
 
             switch (val.type()) {
                 case QVariant::ByteArray:
@@ -973,7 +974,6 @@ bool QMYSQLResult::exec()
                     currBind->buffer_type = MYSQL_TYPE_DOUBLE;
                     currBind->buffer = data;
                     currBind->buffer_length = sizeof(double);
-                    currBind->is_unsigned = 0;
                     break;
                 case QVariant::LongLong:
                 case QVariant::ULongLong:
@@ -989,7 +989,6 @@ bool QMYSQLResult::exec()
                     currBind->buffer_type = MYSQL_TYPE_STRING;
                     currBind->buffer = const_cast<char *>(ba.constData());
                     currBind->buffer_length = ba.length();
-                    currBind->is_unsigned = 0;
                     break; }
             }
         }
diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp
index d63c482..a7031b1 100644
--- a/src/sql/drivers/oci/qsql_oci.cpp
+++ b/src/sql/drivers/oci/qsql_oci.cpp
@@ -1789,7 +1789,7 @@ bool QOCIResult::prepare(const QString& query)
 bool QOCIResult::exec()
 {
     int r = 0;
-    ub2 stmtType;
+    ub2 stmtType=0;
     ub4 iters;
     ub4 mode;
     QList<QByteArray> tmpStorage;
@@ -1803,6 +1803,16 @@ bool QOCIResult::exec()
                     OCI_ATTR_STMT_TYPE,
                     d->err);
 
+    if (r != OCI_SUCCESS && r != OCI_SUCCESS_WITH_INFO) {
+        qOraWarning("QOCIResult::exec: Unable to get statement type:", d->err);
+        setLastError(qMakeError(QCoreApplication::translate("QOCIResult",
+                     "Unable to get statement type"), QSqlError::StatementError, d->err));
+#ifdef QOCI_DEBUG
+        qDebug() << "lastQuery()" << lastQuery();
+#endif
+        return false;
+    }
+
     if (stmtType == OCI_STMT_SELECT) {
         iters = 0;
         mode = OCI_DEFAULT;