diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2009-02-14 15:46:37 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2009-02-14 15:46:37 +0000 |
| commit | 3fa1179fa688a7234bf6acecf2ecc24478a18f8c (patch) | |
| tree | c6a12ce8a620896ccb24346b018de423035029a3 /x11-libs/qt-sql/files | |
| parent | revbump with qt-copy patches,Thanks to Maciej Mrozowski (reavertm) (diff) | |
| download | gentoo-2-3fa1179fa688a7234bf6acecf2ecc24478a18f8c.tar.gz gentoo-2-3fa1179fa688a7234bf6acecf2ecc24478a18f8c.tar.bz2 gentoo-2-3fa1179fa688a7234bf6acecf2ecc24478a18f8c.zip | |
revbump with qt-copy patches, Thanks to Maciej Mrozowski (reavertm)
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'x11-libs/qt-sql/files')
| -rw-r--r-- | x11-libs/qt-sql/files/0234-fix-mysql-threaded.diff | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/x11-libs/qt-sql/files/0234-fix-mysql-threaded.diff b/x11-libs/qt-sql/files/0234-fix-mysql-threaded.diff new file mode 100644 index 000000000000..4c5b6136b8c1 --- /dev/null +++ b/x11-libs/qt-sql/files/0234-fix-mysql-threaded.diff @@ -0,0 +1,32 @@ +qt-bugs@ issue : N217716 +Trolltech task ID : 217788 +bugs.kde.org number : no report +applied: no +author: Tobias Koenig <tokoe@kde.org> + +This patch will fix the handling of connections to +mysql server in a multithreaded environment + +--- src/sql/drivers/mysql/qsql_mysql.cpp (revision 804421) ++++ src/sql/drivers/mysql/qsql_mysql.cpp (working copy) +@@ -1215,6 +1215,10 @@ + d->preparedQuerysEnabled = false; + #endif + ++#ifndef QT_NO_THREAD ++ mysql_thread_init(); ++#endif ++ + setOpen(true); + setOpenError(false); + return true; +@@ -1223,6 +1227,9 @@ + void QMYSQLDriver::close() + { + if (isOpen()) { ++#ifndef QT_NO_THREAD ++ mysql_thread_end(); ++#endif + mysql_close(d->mysql); + setOpen(false); + setOpenError(false); |