Commit bbad4c1e authored by unknown's avatar unknown
Browse files

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


BUILD/check-cpu:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
parents 91eddf6a 45b9381f

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ sub command_line_setup () { 
  # 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 );

  $sockdir = tempdir(CLEANUP => 0) if ( length($sockdir) > 80 );



  # Put this into a hash, will be a C struct