[bacula] MySQL 5.5 patch.

Jon Ciesla limb at fedoraproject.org
Thu Jan 6 17:34:49 UTC 2011


commit 187db2a167eefa394d7dff9a92f9da40b1dcdb21
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Jan 6 11:32:03 2011 -0600

    MySQL 5.5 patch.

 bacula-5.0.3-mysql55.patch |   11 +++++++++++
 bacula.spec                |    4 +++-
 2 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/bacula-5.0.3-mysql55.patch b/bacula-5.0.3-mysql55.patch
new file mode 100644
index 0000000..ea459c2
--- /dev/null
+++ b/bacula-5.0.3-mysql55.patch
@@ -0,0 +1,11 @@
+--- src/cats/mysql.c~	2010-08-05 09:29:51.000000000 -0500
++++ src/cats/mysql.c	2011-01-06 11:28:59.907306001 -0600
+@@ -292,7 +292,7 @@
+ void db_thread_cleanup()
+ { 
+ #ifndef HAVE_WIN32
+-   my_thread_end();
++   mysql_thread_end();
+ #endif
+ }
+ 
diff --git a/bacula.spec b/bacula.spec
index e5135b3..3b6c913 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -52,6 +52,7 @@ Patch18: bacula-5.0.3-dsolink.patch
 Patch19: bacula-5.0.3-log-path.patch
 Patch20: bacula-5.0.3-sqlite-priv.patch
 Patch21: bacula-5.0.3-tray-dir.patch
+Patch22: bacula-5.0.3-mysql55.patch
 
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -370,6 +371,7 @@ pushd bacula-%{version}
 %patch19 -p2 -b .log-path
 %patch20 -p0 -b .priv
 %patch21 -p2 -b .tray-dir
+%patch22 -p0 -b .mysql55
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -1025,7 +1027,7 @@ fi
 
 %changelog
 * Mon Jan 03 2011 Jon Ciesla <limb at jcomserv.net> - 5.0.3-7
-- Rebuild for MySQL 5.5.
+- Rebuild for MySQL 5.5, with patch.
 
 * Fri Nov 26 2010 Jan Görig <jgorig at redhat.com> - 5.0.3-6
 - Fixed previous fix of alternatives


More information about the scm-commits mailing list