diff --git a/mysql-disable-test.patch b/mysql-disable-test.patch
new file mode 100644
index 0000000..becbcf2
--- /dev/null
+++ b/mysql-disable-test.patch
@@ -0,0 +1,16 @@
+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
+(note that upstream has also disabled it, but only for Solaris, so we still
+need this patch).
+
+
+diff -Naur mysql-5.1.51.orig/mysql-test/t/disabled.def mysql-5.1.51/mysql-test/t/disabled.def
+--- mysql-5.1.51.orig/mysql-test/t/disabled.def	2010-09-13 10:10:50.000000000 -0400
++++ mysql-5.1.51/mysql-test/t/disabled.def	2010-10-07 11:15:46.167693893 -0400
+@@ -14,3 +14,5 @@
+ partition_innodb_plugin  : Bug#53307 2010-04-30 VasilDimov valgrind warnings
+ main.mysqlhotcopy_myisam : bug#54129 2010-06-04 Horst
+ main.mysqlhotcopy_archive: bug#54129 2010-06-04 Horst
++#
++outfile_loaddata         : bug#46895 code wrong, expected results wrong too
diff --git a/mysql.spec b/mysql.spec
index fd88745..2dac0ad 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.1.51
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -35,6 +35,7 @@ Patch2: mysql-errno.patch
 Patch4: mysql-testing.patch
 Patch5: mysql-install-test.patch
 Patch6: mysql-stack-guard.patch
+Patch7: mysql-disable-test.patch
 Patch8: mysql-setschedparam.patch
 Patch9: mysql-no-docs.patch
 Patch10: mysql-strmov.patch
@@ -174,6 +175,7 @@ the MySQL sources.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -575,6 +577,9 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Oct  7 2010 Tom Lane <tgl@redhat.com> 5.1.51-2
+- Re-disable the outfile_loaddata test, per report from Dan Horak.
+
 * Wed Oct  6 2010 Tom Lane <tgl@redhat.com> 5.1.51-1
 - Update to MySQL 5.1.51, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-51.html