rev 11412 - in trunk/packages/qt4-x11/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2008-07-09 00:53:24 +0000 (Wed, 09 Jul 2008)
New Revision: 11412

Added:
   trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
Add 0234-fix-mysql-threaded.diff from qt-copy to fix usage of qt with
mysql in multithreaded environments

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-07-09 00:51:05 UTC (rev 11411)
+++ trunk/packages/qt4-x11/debian/changelog	2008-07-09 00:53:24 UTC (rev 11412)
@@ -16,6 +16,8 @@
     Patch from Trolltech.
   * Add 0003_tab_text_cutoff.diff patch to fix rendering of text in tabs.
     Patch available in qt4.5.
+  * Add 0234-fix-mysql-threaded.diff from qt-copy to fix usage of qt with
+    mysql in multithreaded environments
 
   +++ Changes by Modestas Vainius:
 

Added: trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff	2008-07-09 00:53:24 UTC (rev 11412)
@@ -0,0 +1,32 @@
+qt-bugs@ issue : N217716
+Trolltech task ID : 217788
+bugs.kde.org number : no report
+applied: yes
+author: Tobias Koenig <tokoe at kde.org>
+
+This patch will fix the handling of connections to
+mysql server in a multithreaded environment
+
+--- a/src/sql/drivers/mysql/qsql_mysql.cpp	(revision 804421)
++++ b/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);

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-07-09 00:51:05 UTC (rev 11411)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-07-09 00:53:24 UTC (rev 11412)
@@ -20,6 +20,7 @@
 0228-qsortfilterproxymodel-invalidate-noscroll.diff
 0230-qtextcontrol-selectnextword.diff
 0233-fix-q3textbrowser-image.diff
+0234-fix-mysql-threaded.diff
 0235-qdbus-dispatch-async-timeout.diff
 0236-qtoolbararealayout-restore.diff