From 602a9944d1305b9aa64297563f98ff5c4306bc43 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 16 Jul 2011 16:49:14 +0200 Subject: mysql, sync with rawhide --- mysql55.spec | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'mysql55.spec') diff --git a/mysql55.spec b/mysql55.spec index aebed1c..11770aa 100644 --- a/mysql55.spec +++ b/mysql55.spec @@ -1,6 +1,6 @@ Name: mysql Version: 5.5.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -45,6 +45,7 @@ Patch8: mysql-dubious-exports.patch Patch10: mysql-embedded-crash.patch Patch11: mysql-plugin-bool.patch Patch12: mysql-s390-tsc.patch +Patch13: mysql-openssl-test.patch # RC patch for backports Patch21: mysql-readline.patch @@ -198,9 +199,13 @@ rm -f Docs/mysql.info %patch6 -p1 %patch7 -p1 %patch8 -p1 +# si below %patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 +%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5 +%patch13 -p1 +%endif # Backports specific patches %patch21 -p1 -b .readline @@ -217,7 +222,6 @@ outfile_loaddata : bug#46895 code wrong, expected results wrong too sys_vars.plugin_dir_basic : bug#52223 fails for lib64 library directory innodb.innodb : bug#60155 has platform-dependent results main.information_schema : fails in mock, ok after install :( -main.openssl_1 : error message seems to have change... EOF @@ -448,7 +452,7 @@ echo -e "\nWARNING : This MySQL RPM is not an official Fedora/Redhat build and i echo -e "overrides the official one. Don't file bugs on Fedora Project nor Redhat." echo -e "Use dedicated forums http://forums.famillecollet.com/\n" -%if %{?fedora}%{!?fedora:99} <= 12 +%if %{?fedora}%{!?fedora:99} <= 13 echo -e "WARNING : Fedora %{fedora} is now EOL :" echo -e "You should consider upgrading to a supported release.\n" %endif @@ -677,10 +681,26 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Sat Jul 16 2011 Remi Collet - 5.5.14-2 +- sync with rawhide + +* Tue Jul 12 2011 Tom Lane 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 +Related: #690346 + +* Mon Jul 11 2011 Tom Lane 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 Remi Collet - 5.5.14-1 - update to MySQL 5.5.14 Community Server GA http://dev.mysql.com/doc/refman/5.5/en/news-5-5-14.html +* Wed Jul 6 2011 Tom Lane 5.5.13-2 +- Remove erroneously-included Default-Start line from LSB init block +Resolves: #717024 + * Thu Jun 2 2011 Tom Lane 5.5.13-1 - Update to MySQL 5.5.13, for various fixes described at http://dev.mysql.com/doc/refman/5.5/en/news-5-5-13.html -- cgit