From bd4e1c52cdedf5f725fecb6838ce2ad970fb8c80 Mon Sep 17 00:00:00 2001
From: Sune Vuorela <debian@pusling.com>
Date: Wed, 9 Jul 2008 00:53:24 +0000
Subject: Add 0234-fix-mysql-threaded.diff from qt-copy to fix usage of qt with
 mysql in multithreaded environments

---
 debian/changelog                            |  2 ++
 debian/patches/0234-fix-mysql-threaded.diff | 32 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 35 insertions(+)
 create mode 100644 debian/patches/0234-fix-mysql-threaded.diff

diff --git a/debian/changelog b/debian/changelog
index 4247106..c7c5928 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ qt4-x11 (4.4.0-4~pre1) unstable; urgency=low
     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:
 
diff --git a/debian/patches/0234-fix-mysql-threaded.diff b/debian/patches/0234-fix-mysql-threaded.diff
new file mode 100644
index 0000000..f38a656
--- /dev/null
+++ b/debian/patches/0234-fix-mysql-threaded.diff
@@ -0,0 +1,32 @@
+qt-bugs@ issue : N217716
+Trolltech task ID : 217788
+bugs.kde.org number : no report
+applied: yes
+author: Tobias Koenig <tokoe@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);
diff --git a/debian/patches/series b/debian/patches/series
index 53ede42..2a8919c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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
 
-- 
cgit v1.2.3