[mysql/f15] Update to MySQL 5.5.15

[Tom Lane]

commit 06d9e740a7342a62adb5bc0fa4b4bed767862c08
Author: Tom Lane <tgl at redhat.com>
Date:   Fri Jul 29 17:36:37 2011 -0400

    Update to MySQL 5.5.15

 .gitignore                 |    2 +-
 mysql-disable-test.patch   |   10 +++++-----
 mysql-embedded-crash.patch |   19 -------------------
 mysql.spec                 |   20 +++++++++++++-------
 sources                    |    2 +-
 5 files changed, 20 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e317ed..994ce30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mysql-5.5.14-nodocs.tar.gz
+/mysql-5.5.15-nodocs.tar.gz
diff --git a/mysql-disable-test.patch b/mysql-disable-test.patch
index be499bc..1d9403e 100644
--- a/mysql-disable-test.patch
+++ b/mysql-disable-test.patch
@@ -14,12 +14,12 @@ Also disable innodb.innodb, which is showing platform-dependent results
 as of 5.5.9.  Upstream at http://bugs.mysql.com/bug.php?id=60155
 
 
-diff -Naur mysql-5.5.14.orig/mysql-test/t/disabled.def mysql-5.5.14/mysql-test/t/disabled.def
---- mysql-5.5.14.orig/mysql-test/t/disabled.def	2011-06-21 12:42:40.000000000 -0400
-+++ mysql-5.5.14/mysql-test/t/disabled.def	2011-07-11 14:33:46.560138525 -0400
-@@ -17,3 +17,7 @@
+diff -Naur mysql-5.5.15.orig/mysql-test/t/disabled.def mysql-5.5.15/mysql-test/t/disabled.def
+--- mysql-5.5.15.orig/mysql-test/t/disabled.def	2011-07-13 15:09:03.000000000 -0400
++++ mysql-5.5.15/mysql-test/t/disabled.def	2011-07-29 11:48:39.214514072 -0400
+@@ -16,3 +16,7 @@
+ create-big               : Bug#11748731 2010-11-15 mattiasj was not tested
  archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
- main.query_cache_28249   : Bug#12584161 2009-03-25 main.query_cache_28249 fails sporadically
  log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
 +#
 +outfile_loaddata         : bug#46895 code wrong, expected results wrong too
diff --git a/mysql.spec b/mysql.spec
index 0594a36..83c6717 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,9 @@
 Name: mysql
-Version: 5.5.14
-Release: 2%{?dist}
+Version: 5.5.15
+Release: 1%{?dist}
+# NOTE: Our convention for the life of F15 is that sysv packages will be
+# numbered 1dist.n while systemd packages will be 2dist and higher.
+
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -32,6 +35,7 @@ Source10: mysql.tmpfiles.d
 # Working around perl dependency checking bug in rpm FTTB. Remove later.
 Source999: filter-requires-mysql.sh
 
+# Comments for these patches are in the patch files.
 Patch1: mysql-errno.patch
 Patch2: mysql-strmov.patch
 Patch3: mysql-install-test.patch
@@ -41,10 +45,9 @@ Patch6: mysql-chain-certs.patch
 Patch7: mysql-versioning.patch
 Patch8: mysql-dubious-exports.patch
 Patch9: mysql-disable-test.patch
-Patch10: mysql-embedded-crash.patch
-Patch11: mysql-plugin-bool.patch
-Patch12: mysql-s390-tsc.patch
-Patch13: mysql-openssl-test.patch
+Patch10: mysql-plugin-bool.patch
+Patch11: mysql-s390-tsc.patch
+Patch12: mysql-openssl-test.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl, readline-devel, openssl-devel
@@ -188,7 +191,6 @@ the MySQL sources.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -611,6 +613,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri Jul 29 2011 Tom Lane <tgl at redhat.com> 5.5.15-1
+- Update to MySQL 5.5.15, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.5/en/news-5-5-15.html
+
 * Tue Jul 12 2011 Tom Lane <tgl at redhat.com> 5.5.14-2
 - Remove make_scrambled_password and make_scrambled_password_323 from mysql.h,
   since we're not allowing clients to call those functions anyway
diff --git a/sources b/sources
index 5992a1e..cdd2507 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bbcb4fa2876714efc7c5f3e0c16c61e9  mysql-5.5.14-nodocs.tar.gz
+3a276581349e8112975a12bb3100f67f  mysql-5.5.15-nodocs.tar.gz