bk commit into 5.1 tree (msvensson:1.2583)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-21 23:12:28+02:00, msvensson@stripped +1 -0
  Move the check for socket path truncation to after the tmpdir has been created
  since it's used by the check

  mysql-test/mysql-test-run.pl@stripped, 2008-04-21 23:12:26+02:00, msvensson@stripped +9 -9
    Move the check for socket path truncation to after the tmpdir has been created
    since it's used by the check

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2008-04-21 21:47:11 +02:00
+++ b/mysql-test/mysql-test-run.pl	2008-04-21 23:12:26 +02:00
@@ -606,15 +606,6 @@ sub command_line_setup {
   $opt_tmpdir=       "$opt_vardir/tmp" unless $opt_tmpdir;
   $opt_tmpdir =~ s,/+$,,;       # Remove ending slash if any
 
-  # On some operating systems, there is a limit to the length of a
-  # UNIX domain socket's path far below PATH_MAX.
-  # Don't allow that to happen
-  if (check_socket_path_length("$opt_tmpdir/testsocket.sock")){
-    mtr_error("Socket path '$opt_tmpdir' too long, it would be ",
-	      "truncated and thus not possible to use for connection to ",
-	      "MySQL Server. Set a shorter with --tmpdir=<path> option");
-  }
-
   # --------------------------------------------------------------------------
   # fast option
   # --------------------------------------------------------------------------
@@ -1438,6 +1429,15 @@ sub setup_vardir() {
   if ($opt_tmpdir ne "$opt_vardir/tmp"){
     mtr_report(" - symlinking 'var/tmp' to '$opt_tmpdir'");
     symlink($opt_tmpdir, "$opt_vardir/tmp");
+  }
+
+  # On some operating systems, there is a limit to the length of a
+  # UNIX domain socket's path far below PATH_MAX.
+  # Don't allow that to happen
+  if (check_socket_path_length("$opt_tmpdir/testsocket.sock")){
+    mtr_error("Socket path '$opt_tmpdir' too long, it would be ",
+	      "truncated and thus not possible to use for connection to ",
+	      "MySQL Server. Set a shorter with --tmpdir=<path> option");
   }
 
   # copy all files from std_data into var/std_data