[mysql/f18] Update to MySQL 5.5.29

[Tom Lane]

commit afa8cae444894a094edc97d3a2102f4f137268c5
Author: Tom Lane <tgl at redhat.com>
Date:   Wed Jan 2 15:02:47 2013 -0500

    Update to MySQL 5.5.29

 .gitignore                |    2 +-
 my.cnf                    |    8 ++--
 mysql-cve-2012-5611.patch |   81 ---------------------------------------------
 mysql.spec                |   17 +++++----
 mysqld-wait-ready         |    2 +-
 sources                   |    2 +-
 6 files changed, 17 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d54f41e..a7f3c6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mysql-5.5.28-nodocs.tar.gz
+/mysql-5.5.29-nodocs.tar.gz
diff --git a/my.cnf b/my.cnf
index 692a4bb..96282ea 100644
--- a/my.cnf
+++ b/my.cnf
@@ -1,12 +1,12 @@
 [mysqld]
-# Settings user and group are ignored when systemd is used.
-# If you need to run mysqld under different user or group, 
-# customize your systemd unit file for mysqld according to the
-# instructions in http://fedoraproject.org/wiki/Systemd
 datadir=/var/lib/mysql
 socket=/var/lib/mysql/mysql.sock
 # Disabling symbolic-links is recommended to prevent assorted security risks
 symbolic-links=0
+# Settings user and group are ignored when systemd is used.
+# If you need to run mysqld under a different user or group,
+# customize your systemd unit file for mysqld according to the
+# instructions in http://fedoraproject.org/wiki/Systemd
 
 [mysqld_safe]
 log-error=/var/log/mysqld.log
diff --git a/mysql.spec b/mysql.spec
index a6facc5..3e9fdca 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.5.28
-Release: 3%{?dist}
+Version: 5.5.29
+Release: 1%{?dist}
 
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -56,7 +56,6 @@ Patch18: mysql-cipherspec.patch
 Patch19: mysql-file-contents.patch
 Patch20: mysql-string-overflow.patch
 Patch21: mysql-dh1024.patch
-Patch22: mysql-cve-2012-5611.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl, readline-devel, openssl-devel
@@ -81,9 +80,8 @@ Obsoletes: mysql-cluster < 5.1.44
 %global __perl_requires %{SOURCE999}
 %global __perllib_requires %{SOURCE999}
 
-# patch utility does automatically back-up of chunks that didn't apply
-# smoothly, but we don't want to create that files because they could be
-# included in RPM incorrectly
+# By default, patch(1) creates backup files when chunks apply with offsets.
+# Turn that off to ensure such files don't get included in RPMs (cf bz#884755).
 %global _default_patch_flags --no-backup-if-mismatch
 
 %description
@@ -217,7 +215,6 @@ the MySQL sources.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-%patch22 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -710,6 +707,12 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Wed Jan  2 2013 Tom Lane <tgl at redhat.com> 5.5.29-1
+- Update to MySQL 5.5.29, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.5/en/news-5-5-29.html
+- Fix inaccurate default for socket location in mysqld-wait-ready
+Resolves: #890535
+
 * Thu Dec  6 2012 Honza Horak <hhorak at redhat.com> 5.5.28-3
 - Rebase patches to not leave backup files when not applied smoothly
 - Use --no-backup-if-mismatch to prevent including backup files
diff --git a/mysqld-wait-ready b/mysqld-wait-ready
index 9b0fd0c..9e5d3e4 100644
--- a/mysqld-wait-ready
+++ b/mysqld-wait-ready
@@ -25,7 +25,7 @@ get_mysql_option(){
 # Defaults here had better match what mysqld_safe will default to
 get_mysql_option mysqld datadir "/var/lib/mysql"
 datadir="$result"
-get_mysql_option mysqld socket "$datadir/mysql.sock"
+get_mysql_option mysqld socket "/var/lib/mysql/mysql.sock"
 socketfile="$result"
 
 # Wait for the server to come up or for the mysqld process to disappear
diff --git a/sources b/sources
index 0e73348..093f772 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88d39960d3f348836f803aca091ee601  mysql-5.5.28-nodocs.tar.gz
+2b9473a36a98c54cd671ba60ce873289  mysql-5.5.29-nodocs.tar.gz