init 6.1.0

Author: stoeckerb

.gitignore

@@ -1,3 +1,4 @@
 /mysql/mysql.pro.user
 /sqldrivers.pro.user
 /sqldrivers.pro.user.a8272da
+/sqldrivers.pro.user.8a43d23

mysql/CMakeLists.txt

@@ -13,7 +13,7 @@ qt_internal_add_plugin(QMYSQLDriverPlugin
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    PUBLIC_LIBRARIES
+    LIBRARIES
         MySQL::MySQL
         Qt::Core
         Qt::CorePrivate

mysql/qsql_mysql.cpp

@@ -317,15 +317,14 @@ void QMYSQLResultPrivate::bindBlobs()
 
 bool QMYSQLResultPrivate::bindInValues()
 {
-    MYSQL_BIND *bind;
-    char *field;
-    int i = 0;
-
     if (!meta)
         meta = mysql_stmt_result_metadata(stmt);
     if (!meta)
         return false;
 
+    MYSQL_BIND *bind;
+    char *field;
+    int i = 0;
     fields.resize(mysql_num_fields(meta));
 
     inBinds = new MYSQL_BIND[fields.size()];
@@ -873,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;
@@ -895,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];