diff options
| author | Calvin Morrison <calvin@boxi.(none)> | 2011-11-13 19:22:56 -0500 |
|---|---|---|
| committer | Calvin Morrison <calvin@boxi.(none)> | 2011-11-13 19:22:56 -0500 |
| commit | 7123ebd91f9851d8a0479d043508ec5885e24f91 (patch) | |
| tree | b47f9157735eae19da0c14240f4175598b6a3814 /arch/calvin/trinity-qt3/old-patches/mysql.patch | |
| parent | 020bf83511bd20e1ab3ff699fbeecdb9a76bf525 (diff) | |
| download | tde-packaging-7123ebd91f9851d8a0479d043508ec5885e24f91.tar.gz tde-packaging-7123ebd91f9851d8a0479d043508ec5885e24f91.zip | |
removed old calvin folder
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, 0 insertions, 47 deletions
diff --git a/arch/calvin/trinity-qt3/old-patches/mysql.patch b/arch/calvin/trinity-qt3/old-patches/mysql.patch deleted file mode 100644 index 5f61edc67..000000000 --- a/arch/calvin/trinity-qt3/old-patches/mysql.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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 |