[mysql/f15/master] Update to MySQL 5.5.9

[Tom Lane]

commit 3a7ff43517cb2d4ac40fe55fc8d4b4707b25c975
Author: Tom Lane <tgl at redhat.com>
Date:   Sat Feb 12 19:08:41 2011 -0500

    Update to MySQL 5.5.9

 .gitignore |    2 +-
 mysql.spec |   33 +++++++++++++++++++--------------
 sources    |    2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bb555d9..f6f4a05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mysql-5.5.8-nodocs.tar.gz
+/mysql-5.5.9-nodocs.tar.gz
diff --git a/mysql.spec b/mysql.spec
index a8103db..dacf189 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.5.8
-Release: 10%{?dist}
+Version: 5.5.9
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -55,7 +55,7 @@ BuildRequires: time procps
 BuildRequires: perl(Socket), perl(Time::HiRes)
 
 Requires: grep, fileutils
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: bash
 
 # MySQL (with caps) is upstream's spelling of their own RPMs for mysql
@@ -89,8 +89,8 @@ MySQL server.
 
 Summary: The MySQL server and related files
 Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: sh-utils
 Requires(pre): /usr/sbin/useradd
 Requires(post): chkconfig
@@ -112,9 +112,9 @@ the MySQL server and some accompanying files and directories.
 
 Summary: Files for development of MySQL applications
 Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-Requires: openssl-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: openssl-devel%{?_isa}
 Conflicts: MySQL-devel
 
 %description devel
@@ -136,8 +136,8 @@ into a client application instead of running as a separate process.
 
 Summary: Development files for MySQL as an embeddable library
 Group: Applications/Databases
-Requires: %{name}-embedded = %{version}-%{release}
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-embedded%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 
 %description embedded-devel
 MySQL is a multi-user, multi-threaded SQL database server. This
@@ -148,7 +148,7 @@ the embedded version of the MySQL server.
 
 Summary: MySQL benchmark scripts and data
 Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Conflicts: MySQL-bench
 
 %description bench
@@ -160,9 +160,9 @@ MySQL.
 
 Summary: The test suite distributed with MySQL
 Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-server = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-server%{?_isa} = %{version}-%{release}
 Conflicts: MySQL-test
 
 %description test
@@ -604,6 +604,11 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sat Feb 12 2011 Tom Lane <tgl at redhat.com> 5.5.9-1
+- Update to MySQL 5.5.9, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.5/en/news-5-5-9.html
+- Add %%{?_isa} to cross-subpackage Requires, per latest packaging guidelines
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5.8-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 00d9f3f..7f0f2c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2214f5a79516c1e6b36b82f1dd361a0  mysql-5.5.8-nodocs.tar.gz
+bfefb571663d4716284d930f2c1b8278  mysql-5.5.9-nodocs.tar.gz