[mysql/f17] Update to MySQL 5.5.25a; stop using systemd's Restart option

[Tom Lane]

commit e2b4b3453d7a9b66f115ec27c6f7bebf6275035b
Author: Tom Lane <tgl at redhat.com>
Date:   Fri Jul 6 11:49:25 2012 -0400

    Update to MySQL 5.5.25a; stop using systemd's Restart option

 .gitignore           |    2 +-
 mysql.spec           |   11 +++++++--
 mysqld-nowatch.patch |   51 --------------------------------------------------
 mysqld-wait-ready    |    2 +-
 mysqld.service       |    7 +----
 sources              |    2 +-
 6 files changed, 13 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d942bd7..f6d64c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mysql-5.5.24-nodocs.tar.gz
+/mysql-5.5.25a-nodocs.tar.gz
diff --git a/mysql.spec b/mysql.spec
index b521eb3..f3492e2 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.5.24
+Version: 5.5.25a
 Release: 1%{?dist}
 
 Summary: MySQL client programs and shared libraries
@@ -49,7 +49,6 @@ Patch8: mysql-dubious-exports.patch
 Patch10: mysql-plugin-bool.patch
 Patch11: mysql-s390-tsc.patch
 Patch12: mysql-openssl-test.patch
-Patch13: mysqld-nowatch.patch
 Patch14: mysql-va-list.patch
 Patch15: mysql-netdevname.patch
 Patch16: mysql-logrotate.patch
@@ -205,7 +204,6 @@ the MySQL sources.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
@@ -693,6 +691,13 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri Jul  6 2012 Tom Lane <tgl at redhat.com> 5.5.25a-1
+- Update to MySQL 5.5.25a, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.5/en/news-5-5-25a.html
+  http://dev.mysql.com/doc/refman/5.5/en/news-5-5-25.html
+- Don't use systemd's Restart feature; rely on mysqld_safe instead
+Resolves: #832029
+
 * Mon Jun 11 2012 Tom Lane <tgl at redhat.com> 5.5.24-1
 - Update to MySQL 5.5.24, for various fixes described at
   http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html
diff --git a/mysqld-wait-ready b/mysqld-wait-ready
index 10e86fe..8fe99ec 100644
--- a/mysqld-wait-ready
+++ b/mysqld-wait-ready
@@ -6,7 +6,7 @@
 # Running this as ExecStartPost is useful so that services declared as
 # "After mysqld" won't be started until the database is really ready.
 
-# Service file passes us the daemon's PID
+# Service file passes us the daemon's PID (actually, mysqld_safe's PID)
 daemon_pid="$1"
 
 # extract value of a MySQL option from config files
diff --git a/mysqld.service b/mysqld.service
index 7289f9d..c6e4dea 100644
--- a/mysqld.service
+++ b/mysqld.service
@@ -23,22 +23,19 @@ After=syslog.target
 After=network.target
 
 [Service]
-Type=forking
+Type=simple
 User=mysql
 Group=mysql
 
 ExecStartPre=/usr/libexec/mysqld-prepare-db-dir
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
 # per bug #547485
-ExecStart=/usr/bin/mysqld_safe --nowatch --basedir=/usr
+ExecStart=/usr/bin/mysqld_safe --basedir=/usr
 ExecStartPost=/usr/libexec/mysqld-wait-ready $MAINPID
 
 # Give a reasonable amount of time for the server to start up/shut down
 TimeoutSec=300
 
-# We rely on systemd, not mysqld_safe, to restart mysqld if it dies
-Restart=always
-
 # Place temp files in a secure directory, not /tmp
 PrivateTmp=true
 
diff --git a/sources b/sources
index 87aa00a..1598ba1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e42efbddfa93a16ec137dfcbeb996c24  mysql-5.5.24-nodocs.tar.gz
+4f0db6cea9f201aa89fb7c80ac915796  mysql-5.5.25a-nodocs.tar.gz