summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2006-12-20 19:24:04 +0100
committerunknown <joerg@trift2.>2006-12-20 19:24:04 +0100
commit66a5ed9fec03d6408b9c09705d2bb3c4c1961592 (patch)
treed2ecc175852683fa712281cee94cecd11ae90485 /mysql-test
parentfd0a4f225f0f1419f6d082d307ca9ebdb23c77ec (diff)
parentc32d646d252dd234947dcb54c1fedb9703053819 (diff)
downloadmariadb-git-66a5ed9fec03d6408b9c09705d2bb3c4c1961592.tar.gz
Merge trift2.:/MySQL/M50/upward-5.0
into trift2.:/MySQL/M51/push-5.1 mysql-test/mysql-test-run.pl: Auto merged scripts/make_binary_distribution.sh: Auto merged support-files/mysql.spec.sh: Auto merged
Diffstat (limited to 'mysql-test')
-rwxr-xr-xmysql-test/mysql-test-run.pl6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 73755cd2df9..ccee36025ee 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;
@@ -1020,6 +1021,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]=