From 6b583b436a7dd6af73bfc9aed6e79748980bc7bc Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@redhat.com>
Date: Jan 27 2012 05:58:01 +0000
Subject: Update to MySQL 5.5.20


---

diff --git a/.gitignore b/.gitignore
index dc8839a..dd6011c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mysql-5.5.19-nodocs.tar.gz
+/mysql-5.5.20-nodocs.tar.gz
diff --git a/mysql-logrotate.patch b/mysql-logrotate.patch
new file mode 100644
index 0000000..dd8742a
--- /dev/null
+++ b/mysql-logrotate.patch
@@ -0,0 +1,25 @@
+Adjust the mysql-log-rotate script to contain the correct log file
+name for Red Hat installations.
+
+
+diff -Naur mysql-5.5.20.orig/support-files/mysql-log-rotate.sh mysql-5.5.20/support-files/mysql-log-rotate.sh
+--- mysql-5.5.20.orig/support-files/mysql-log-rotate.sh	2011-12-16 14:52:06.000000000 -0500
++++ mysql-5.5.20/support-files/mysql-log-rotate.sh	2012-01-26 23:24:54.402676177 -0500
+@@ -3,7 +3,7 @@
+ # in the [safe_mysqld] section as follows:
+ #
+ # [safe_mysqld]
+-# err-log=@localstatedir@/mysqld.log
++# err-log=/var/log/mysqld.log
+ #
+ # If the root user has a password you have to create a
+ # /root/.my.cnf configuration file with the following
+@@ -18,7 +18,7 @@
+ # ATTENTION: This /root/.my.cnf should be readable ONLY
+ # for root !
+ 
+-@localstatedir@/mysqld.log {
++/var/log/mysqld.log {
+         # create 600 mysql mysql
+         notifempty
+ 	daily
diff --git a/mysql.spec b/mysql.spec
index 9c2dd72..487506a 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.5.19
+Version: 5.5.20
 Release: 1%{?dist}
 
 Summary: MySQL client programs and shared libraries
@@ -51,6 +51,7 @@ Patch12: mysql-openssl-test.patch
 Patch13: mysqld-nowatch.patch
 Patch14: mysql-va-list.patch
 Patch15: mysql-netdevname.patch
+Patch16: mysql-logrotate.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl, readline-devel, openssl-devel
@@ -203,6 +204,7 @@ the MySQL sources.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -404,11 +406,15 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/magic
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ndb-config-2-node.ini
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql.server
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysqld_multi.server
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/comp_err.1*
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1*
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-test-run.pl.1*
 
+# put logrotate script where it needs to be
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+mv ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mysqld
+chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mysqld
+
 mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
 echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 
@@ -622,6 +628,7 @@ fi
 %attr(0755,mysql,mysql) %dir /var/run/mysqld
 %attr(0755,mysql,mysql) %dir /var/lib/mysql
 %attr(0640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) /var/log/mysqld.log
+%config(noreplace) %{_sysconfdir}/logrotate.d/mysqld
 
 %files devel
 %defattr(-,root,root)
@@ -656,6 +663,15 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri Jan 27 2012 Tom Lane <tgl@redhat.com> 5.5.20-1
+- Update to MySQL 5.5.20, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.5/en/news-5-5-20.html
+  as well as security fixes described at
+  http://www.oracle.com/technetwork/topics/security/cpujan2012-366304.html
+Resolves: #783828
+- Re-include the mysqld logrotate script, now that it's not so bogus
+Resolves: #547007
+
 * Wed Jan  4 2012 Tom Lane <tgl@redhat.com> 5.5.19-1
 - Update to MySQL 5.5.19, for various fixes described at
   http://dev.mysql.com/doc/refman/5.5/en/news-5-5-19.html
diff --git a/sources b/sources
index d4c4b0c..3184dd4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76c434e3db654f59d06b220daaeeed39  mysql-5.5.19-nodocs.tar.gz
+5968913aa16e7ec207c3e3ab1d6ff0f0  mysql-5.5.20-nodocs.tar.gz