From a864013c84cbefe659d503f2afee2342d030c403 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@redhat.com>
Date: Mon, 21 Mar 2011 14:58:49 -0400
Subject: [PATCH] Update to mysql 5.5.10; fix /var/run/mysqld problem.

---
 .gitignore       |  2 +-
 libmysql.version |  2 +-
 mysql.spec       | 20 ++++++++++++++++++--
 mysql.tmpfiles.d |  1 +
 sources          |  2 +-
 5 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 mysql.tmpfiles.d

diff --git a/.gitignore b/.gitignore
index f6f4a05..42e0686 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mysql-5.5.9-nodocs.tar.gz
+/mysql-5.5.10-nodocs.tar.gz
diff --git a/libmysql.version b/libmysql.version
index 83ac3c9..5ed10ec 100644
--- a/libmysql.version
+++ b/libmysql.version
@@ -117,7 +117,7 @@ libmysqlclient_16 {
 	*;
 };
 # symbols added in mysql 5.5
-libmysqlclient_16.1 {
+libmysqlclient_18 {
   global:
 	mysql_client_find_plugin;
 	mysql_client_register_plugin;
diff --git a/mysql.spec b/mysql.spec
index 90e1dbf..712107f 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.5.9
-Release: 2%{?dist}
+Version: 5.5.10
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -28,6 +28,7 @@ Source6: README.mysql-docs
 Source7: README.mysql-license
 Source8: libmysql.version
 Source9: mysql-embedded-check.c
+Source10: mysql.tmpfiles.d
 # Working around perl dependency checking bug in rpm FTTB. Remove later.
 Source999: filter-requires-mysql.sh
 
@@ -98,6 +99,8 @@ Requires(preun): chkconfig
 # This is for /sbin/service
 Requires(preun): initscripts
 Requires(postun): initscripts
+# This is for /etc/tmpfiles.d
+Requires: systemd-units
 # mysqlhotcopy needs DBI/DBD support
 Requires: perl-DBI, perl-DBD-MySQL
 Conflicts: MySQL-server
@@ -333,6 +336,9 @@ install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql
 install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysqld
 install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/my.cnf
 
+mkdir -p $RPM_BUILD_ROOT/etc/tmpfiles.d
+install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT/etc/tmpfiles.d/mysql.conf
+
 # Fix funny permissions that cmake build scripts apply to config files
 chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/mysql/config.*.ini
 
@@ -567,6 +573,7 @@ fi
 %{_datadir}/mysql/config.*.ini
 
 /etc/rc.d/init.d/mysqld
+/etc/tmpfiles.d/mysql.conf
 %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
@@ -604,6 +611,15 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Mar 21 2011 Tom Lane <tgl@redhat.com> 5.5.10-1
+- Update to MySQL 5.5.10, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.5/en/news-5-5-10.html
+  Note that this includes a rather belated soname version bump for
+  libmysqlclient.so, from .16 to .18
+- Add tmpfiles.d config file so that /var/run/mysqld is recreated at boot
+  (only needed in Fedora 15 and later)
+Resolves: #658938
+
 * Wed Feb 16 2011 Tom Lane <tgl@redhat.com> 5.5.9-2
 - Disable a regression test that is now showing platform-dependent results
 Resolves: #674253
diff --git a/mysql.tmpfiles.d b/mysql.tmpfiles.d
new file mode 100644
index 0000000..74cd5f8
--- /dev/null
+++ b/mysql.tmpfiles.d
@@ -0,0 +1 @@
+d /var/run/mysqld 0755 mysql mysql -
diff --git a/sources b/sources
index 7f0f2c4..833f835 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfefb571663d4716284d930f2c1b8278  mysql-5.5.9-nodocs.tar.gz
+11a0edd0f9c46a3ce49773dd537c9236  mysql-5.5.10-nodocs.tar.gz