diff --git a/.cvsignore b/.cvsignore index 60f6c2b..aa3a7d7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mysql-5.1.47-nodocs.tar.gz +mysql-5.1.48-nodocs.tar.gz diff --git a/mysql-plugin-bug.patch b/mysql-plugin-bug.patch index f90e81c..780d2aa 100644 --- a/mysql-plugin-bug.patch +++ b/mysql-plugin-bug.patch @@ -11,13 +11,13 @@ platform-dependent results, with the "expected" results being arguably the wrong ones. This is upstream at http://bugs.mysql.com/bug.php?id=46895 -diff -Naur mysql-5.1.47.orig/mysql-test/t/disabled.def mysql-5.1.47/mysql-test/t/disabled.def ---- mysql-5.1.47.orig/mysql-test/t/disabled.def 2010-05-06 11:58:11.000000000 -0400 -+++ mysql-5.1.47/mysql-test/t/disabled.def 2010-05-24 11:16:14.000000000 -0400 -@@ -13,3 +13,6 @@ +diff -Naur mysql-5.1.48.orig/mysql-test/t/disabled.def mysql-5.1.48/mysql-test/t/disabled.def +--- mysql-5.1.48.orig/mysql-test/t/disabled.def 2010-06-03 12:17:34.000000000 -0400 ++++ mysql-5.1.48/mysql-test/t/disabled.def 2010-06-20 23:49:47.317995474 -0400 +@@ -12,3 +12,6 @@ + kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild. query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically partition_innodb_plugin : Bug#53307 2010-04-30 VasilDimov valgrind warnings - ps_3innodb : Bug#53309 2010-04-30 VasilDimov valgrind warnings +# +plugin_load : gives wrong answer on PPC64 +outfile_loaddata : gives different results on different platforms diff --git a/mysql.spec b/mysql.spec index 7f4de09..4e75964 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,6 +1,6 @@ Name: mysql -Version: 5.1.47 -Release: 2%{?dist} +Version: 5.1.48 +Release: 1%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -574,6 +574,10 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Mon Jun 21 2010 Tom Lane 5.1.48-1 +- Update to MySQL 5.1.48, for various fixes described at + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-48.html + * Fri Jun 4 2010 Tom Lane 5.1.47-2 - Add back "partition" storage engine Resolves: #597390 diff --git a/sources b/sources index ab3cff9..b58ebf0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db89a1bb8b7e7002a3653d144d5abbdc mysql-5.1.47-nodocs.tar.gz +f7bda6d4c8a2acad2e051089bfcc2352 mysql-5.1.48-nodocs.tar.gz