[mysql/f15] Update to MySQL 5.5.14

Tue Jul 12 02:30:51 UTC 2011

commit 805fb40087bc872d365cee58387d9c7f0eede8a8
Author: Tom Lane <tgl at redhat.com>
Date:   Mon Jul 11 22:23:34 2011 -0400

    Update to MySQL 5.5.14

 .gitignore               |    2 +-
 mysql-disable-test.patch |   15 +++++++--------
 mysql-openssl-test.patch |   22 ++++++++++++++++++++++
 mysql.spec               |   10 ++++++++--
 sources                  |    2 +-
 5 files changed, 39 insertions(+), 12 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 923c31a..0e317ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mysql-5.5.13-nodocs.tar.gz
+/mysql-5.5.14-nodocs.tar.gz
diff --git a/mysql-disable-test.patch b/mysql-disable-test.patch
index 902a068..be499bc 100644
--- a/mysql-disable-test.patch
+++ b/mysql-disable-test.patch
@@ -3,25 +3,24 @@ platform-dependent results, with the "expected" results being arguably the
 wrong ones.  This is upstream at http://bugs.mysql.com/bug.php?id=46895
 (note that upstream has also disabled it, but only for Solaris, so we still
 need this patch).
-This is allegedly fixed for 5.5.14 ...
+Still broken in 5.5.14, despite alleged fix.
 
 Also disable sys_vars.plugin_dir_basic, which is broken because
 mysql-test-run doesn't set the right value of MYSQL_LIBDIR.  Upstream at
 http://bugs.mysql.com/bug.php?id=52223
-Still fails in 5.5.13, but apparently due to be fixed soon?
-upstream marked it closed on 2-May.
+Still fails in 5.5.14, even though upstream marked it closed.
 
 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.12.orig/mysql-test/t/disabled.def mysql-5.5.12/mysql-test/t/disabled.def
---- mysql-5.5.12.orig/mysql-test/t/disabled.def	2011-04-11 06:44:01.000000000 -0400
-+++ mysql-5.5.12/mysql-test/t/disabled.def	2011-05-10 18:42:11.742438341 -0400
+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 @@
- alter_table-big          : Bug#37248 2010-11-15 mattiasj was not tested
- create-big               : Bug#37248 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
 +sys_vars.plugin_dir_basic : bug#52223 fails for lib64 library directory
diff --git a/mysql-openssl-test.patch b/mysql-openssl-test.patch
new file mode 100644
index 0000000..f7e8f43
--- /dev/null
+++ b/mysql-openssl-test.patch
@@ -0,0 +1,22 @@
+Adjust openssl_1.result to match actual output when using OpenSSL.
+
+The given expected result seems to be yaSSL-specific, as of mysql 5.5.14.
+Upstream at http://bugs.mysql.com/bug.php?id=61827
+
+
+diff -Naur mysql-5.5.14.orig/mysql-test/r/openssl_1.result mysql-5.5.14/mysql-test/r/openssl_1.result
+--- mysql-5.5.14.orig/mysql-test/r/openssl_1.result	2011-06-21 12:42:40.000000000 -0400
++++ mysql-5.5.14/mysql-test/r/openssl_1.result	2011-07-11 18:52:39.925070616 -0400
+@@ -44,9 +44,9 @@
+ drop user ssl_user1 at localhost, ssl_user2 at localhost,
+ ssl_user3 at localhost, ssl_user4 at localhost, ssl_user5 at localhost;
+ drop table t1;
+-mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation
+-mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation
+-mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation
++mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1)
++mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1)
++mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1)
+ SSL error: Unable to get private key from ''
+ mysqltest: Could not open connection 'default': 2026 SSL connection error: Unable to get private key
+ SSL error: Unable to get certificate from ''
diff --git a/mysql.spec b/mysql.spec
index 0dc4bc9..af6ccbf 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.5.13
-Release: 2%{?dist}
+Version: 5.5.14
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -44,6 +44,7 @@ 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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl, readline-devel, openssl-devel
@@ -187,6 +188,7 @@ 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
@@ -609,6 +611,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Jul 11 2011 Tom Lane <tgl at redhat.com> 5.5.14-1
+- Update to MySQL 5.5.14, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.5/en/news-5-5-14.html
+
 * Wed Jul  6 2011 Tom Lane <tgl at redhat.com> 5.5.13-2
 - Remove erroneously-included Default-Start line from LSB init block
 Resolves: #717024
diff --git a/sources b/sources
index 12bbb1a..5992a1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71b1b0f4ec421cc3505849a0ef7b1de6  mysql-5.5.13-nodocs.tar.gz
+bbcb4fa2876714efc7c5f3e0c16c61e9  mysql-5.5.14-nodocs.tar.gz
