Branch: master

b99016b8 2016-02-22 12:13:35 Timothy Pearson
Automated update from Qt3
M src/sql/drivers/mysql/qsql_mysql.cpp
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 9d49c96..9d2f6c5 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -495,6 +495,7 @@
 	    return FALSE;
     }
 
+    my_bool reconnect = 0;
     for ( it = opts.begin(); it != opts.end(); ++it ) {
 	TQString opt( (*it).upper() );
 	if ( opt == "CLIENT_COMPRESS" )
@@ -512,11 +513,13 @@
 	else if ( opt == "CLIENT_SSL" )
 	    clientOptionFlags |= CLIENT_SSL;
 	else if ( opt == "MYSQL_OPT_RECONNECT" )
-	    mysql_options(d->mysql, MYSQL_OPT_RECONNECT, NULL);
-	else 
+	    reconnect = 1;
+	else
 	    tqWarning( "TQMYSQLDriver::open: Unknown connect option '%s'", (*it).latin1() );
     }
 
+    mysql_options(d->mysql, MYSQL_OPT_RECONNECT, &reconnect);
+
     if ( mysql_real_connect( d->mysql,
 				host,
 				user,