File qt3-mysql-unload-crash.diff of Package qt3

Overview Repositories Revisions Requests Users Attributes Meta

File qt3-mysql-unload-crash.diff of Package qt3 (Revision aea5818210ba1ff11cb9ac51d0ee13da)

Currently displaying revision aea5818210ba1ff11cb9ac51d0ee13da , Show latest

--- src/sql/drivers/mysql/qsql_mysql.cpp
+++ src/sql/drivers/mysql/qsql_mysql.cpp
@@ -37,7 +37,6 @@
 #include "qsql_mysql.h"
 #include <private/qsqlextension_p.h>
 
-#include <qapplication.h>
 #include <qdatetime.h>
 #include <qvaluevector.h>
 #include <qsqlrecord.h>
@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected()
 }
 
 /////////////////////////////////////////////////////////
-static void qServerEnd()
-{
-#ifndef Q_NO_MYSQL_EMBEDDED
-# if MYSQL_VERSION_ID >= 40000
-    mysql_server_end();
-# endif // MYSQL_VERSION_ID
-#endif // Q_NO_MYSQL_EMBEDDED
-}
 
 static void qServerInit()
 {
@@ -366,9 +357,7 @@ static void qServerInit()
 	qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
 #  endif
     }
-    qAddPostRoutine(qServerEnd);
     init = TRUE;    
-    
 # endif // MYSQL_VERSION_ID
 #endif // Q_NO_MYSQL_EMBEDDED
 }
@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver()
 	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
 	delete ext;
     }
+#ifndef Q_NO_MYSQL_EMBEDDED
+# if MYSQL_VERSION_ID > 40000
+    mysql_server_end();
+# endif
+#endif
 }
 
 bool QMYSQLDriver::hasFeature( DriverFeature f ) const

Places

File qt3-mysql-unload-crash.diff of Package qt3 (Revision aea5818210ba1ff11cb9ac51d0ee13da)

Places