diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-09-09 19:42:21 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-09-09 19:42:21 -0500 |
| commit | d9301c40726753022b70cf647f716a71b62f0196 (patch) | |
| tree | 2aea673772e0d925d16de9bfa15df9bcea6cfee1 /arch/calvin/trinity-qt3/old-patches/mysql.patch | |
| parent | 4ff1177df859e74748a37d5a03447ca200f1ce01 (diff) | |
| parent | 1b2e638684ebbf2b777ead2fbbb4b69f3ac00bcb (diff) | |
| download | tde-packaging-d9301c40726753022b70cf647f716a71b62f0196.tar.gz tde-packaging-d9301c40726753022b70cf647f716a71b62f0196.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'arch/calvin/trinity-qt3/old-patches/mysql.patch')
| -rw-r--r-- | arch/calvin/trinity-qt3/old-patches/mysql.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/arch/calvin/trinity-qt3/old-patches/mysql.patch b/arch/calvin/trinity-qt3/old-patches/mysql.patch new file mode 100644 index 000000000..5f61edc67 --- /dev/null +++ b/arch/calvin/trinity-qt3/old-patches/mysql.patch @@ -0,0 +1,47 @@ +--- 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 |