diff --git a/mysql-plugin-bug.patch b/mysql-plugin-bug.patch index 8830bc7..35e79d4 100644 --- a/mysql-plugin-bug.patch +++ b/mysql-plugin-bug.patch @@ -6,14 +6,19 @@ http://bugs.mysql.com/bug.php?id=42144 For the moment, just disable this test. +Also, disable the outfile_loaddata test, which as of 5.1.38 is giving +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.37.orig/mysql-test/t/disabled.def mysql-5.1.37/mysql-test/t/disabled.def ---- mysql-5.1.37.orig/mysql-test/t/disabled.def 2009-07-13 19:43:47.000000000 -0400 -+++ mysql-5.1.37/mysql-test/t/disabled.def 2009-08-02 20:43:36.000000000 -0400 -@@ -13,4 +13,5 @@ + +diff -Naur mysql-5.1.39.orig/mysql-test/t/disabled.def mysql-5.1.39/mysql-test/t/disabled.def +--- mysql-5.1.39.orig/mysql-test/t/disabled.def 2009-09-04 13:01:56.000000000 -0400 ++++ mysql-5.1.39/mysql-test/t/disabled.def 2009-09-23 19:23:42.000000000 -0400 +@@ -13,4 +13,6 @@ innodb_bug39438 : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows. Note that this test is not run on windows and on embedded in PB for main trees currently" query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically init_connect : Bug#44920 2009-07-06 pcrews MTR not processing master.opt input properly on Windows. *Must be done this way due to the nature of the bug* - +# -+plugin_load : gives wrong answer on PPC64 ++plugin_load : gives wrong answer on PPC64 ++outfile_loaddata : gives different results on different platforms diff --git a/mysql.spec b/mysql.spec index 77e9872..1c0c19a 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,6 +1,6 @@ Name: mysql Version: 5.1.39 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases URL: http://www.mysql.com @@ -642,6 +642,9 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Wed Sep 23 2009 Tom Lane 5.1.39-2 +- Work around upstream bug 46895 by disabling outfile_loaddata test + * Tue Sep 22 2009 Tom Lane 5.1.39-1 - Update to MySQL 5.1.39, for various fixes described at http://dev.mysql.com/doc/refman/5.1/en/news-5-1-39.html