From 0cce240581291e0bf26f8e508b5e1ff58271f60e Mon Sep 17 00:00:00 2001
From: "df@kahlann.erinye.com" <>
Date: Fri, 15 Dec 2006 17:45:17 +0100
Subject: [PATCH 1/3] minor fixup

---
 support-files/mysql.spec.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 1bf983cb02c..8a633f0d53a 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -588,7 +588,7 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqlmanager.8*
+%doc %attr(644, root, man) %{_mandir}/man8/mysqlmanager.8*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*

From 905d9e848c39b28eb91864e41f0d56ac3213bcf8 Mon Sep 17 00:00:00 2001
From: "df@kahlann.erinye.com" <>
Date: Fri, 15 Dec 2006 17:57:31 +0100
Subject: [PATCH 2/3] also include data files for varbinary test in binary
 distribution

---
 scripts/make_binary_distribution.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index a6a2f1e3b49..9469cca875d 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -243,6 +243,7 @@ $CP mysql-test/include/*.inc $BASE/mysql-test/include
 $CP mysql-test/include/*.test $BASE/mysql-test/include
 $CP mysql-test/t/*.def $BASE/mysql-test/t
 $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
+    mysql-test/std_data/*.MYD mysql-test/std_data/*.MYI \
     mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \
     mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
     mysql-test/std_data/*.cnf \

From 4a98f36e591a3f6f57974d96a3063ae4d8b3076b Mon Sep 17 00:00:00 2001
From: "df@kahlann.erinye.com" <>
Date: Mon, 18 Dec 2006 13:44:21 +0100
Subject: [PATCH 3/3] Use a temporary directory for sockets if the socket path
 becomes too long.

---
 mysql-test/mysql-test-run.pl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 5002f778da5..397adb9e157 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -58,6 +58,7 @@ $Devel::Trace::TRACE= 0;       # Don't trace boring init stuff
 use File::Path;
 use File::Basename;
 use File::Copy;
+use File::Temp qw / tempdir /;
 use Cwd;
 use Getopt::Long;
 use Sys::Hostname;
@@ -1030,6 +1031,11 @@ sub command_line_setup () {
   my $sockdir = $opt_tmpdir;
   $sockdir =~ s|/+$||;
 
+  # On some operating systems, there is a limit to the length of a
+  # UNIX domain socket's path far below PATH_MAX, so try to avoid long
+  # socket path names.
+  $sockdir = tempdir(CLEANUP => 1) if ( length($sockdir) > 80 );
+
   # Put this into a hash, will be a C struct
 
   $master->[0]=