From 0e75ff5f1cffc84e92408e59ea95fdec437cafe4 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Sat, 10 Dec 2011 22:52:34 +0100
Subject: [PATCH] Mysql 5.5.18 patch

---
 bacula-5.2.2-mysql.patch | 12 ++++++++++++
 bacula.spec              |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 bacula-5.2.2-mysql.patch

diff --git a/bacula-5.2.2-mysql.patch b/bacula-5.2.2-mysql.patch
new file mode 100644
index 0000000..04fe5dc
--- /dev/null
+++ b/bacula-5.2.2-mysql.patch
@@ -0,0 +1,12 @@
+diff -Naur bacula-5.2.2.old/src/cats/mysql.c bacula-5.2.2/src/cats/mysql.c
+--- bacula-5.2.2.old/src/cats/mysql.c	2011-11-26 15:08:12.000000000 +0100
++++ bacula-5.2.2/src/cats/mysql.c	2011-12-10 22:32:47.763334236 +0100
+@@ -296,7 +296,7 @@
+ void B_DB_MYSQL::db_thread_cleanup(void)
+ { 
+ #ifndef HAVE_WIN32
+-   my_thread_end();
++   mysql_thread_end();
+ #endif
+ }
+ 
diff --git a/bacula.spec b/bacula.spec
index a6fc4e3..b83ab62 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -1,6 +1,6 @@
 Name:			bacula
 Version:		5.2.2
-Release:		9%{?dist}
+Release:		10%{?dist}
 Summary:		Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:		GPLv2 with exceptions
@@ -25,6 +25,7 @@ Source18:		bacula-checkconf
 Patch1:			bacula-5.2.2-config.patch
 Patch2:			bacula-5.0.2-openssl.patch
 Patch3:			bacula-5.2.2-queryfile.patch
+Patch4:			bacula-5.2.2-mysql.patch
 Patch5:			bacula-5.2.2-log-path.patch
 Patch6:			bacula-5.0.3-sqlite-priv.patch
 Patch7:			bacula-5.2.1-bat-pamd.patch
@@ -296,6 +297,7 @@ Provides check_bacula support for Nagios.
 %patch1 -p1 -b .config
 %patch2 -p2 -b .openssl
 %patch3 -p1 -b .queryfile
+%patch4 -p1 -b .mysql
 %patch5 -p1 -b .log-path
 %patch6 -p0 -b .priv
 %patch7 -p1 -b .bat-pamd
@@ -842,6 +844,9 @@ fi
 
 
 %changelog
+* Sat Dec 10 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-10
+- Added patch for mysql 5.5.18 from Oliver Falk.
+
 * Wed Dec 07 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-9
 - Add sample-query.sql as config file.
 - Small log changes.