Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace

into  neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace


mysql-test/mysql-test-run.pl:
  Merge

mysql-test/mysql-test-run.pl

@@ -160,7 +160,7 @@ our $path_mysqltest_log;
 our $path_slave_load_tmpdir;     # What is this?!
 our $path_my_basedir;
 our $opt_vardir;                 # A path but set directly on cmd line
-our $opt_vardir_unix;            # Always unix formatted opt_vardir
+our $opt_vardir_trace;           # unix formatted opt_vardir for trace files
 our $opt_tmpdir;                 # A path but set directly on cmd line
 
 our $opt_usage;
@@ -664,7 +664,7 @@ sub command_line_setup () {
   {
     $opt_vardir= "$glob_mysql_test_dir/var";
   }
-  $opt_vardir_unix= $opt_vardir;
+  $opt_vardir_trace= $opt_vardir;
   # We make the path absolute, as the server will do a chdir() before usage
   unless ( $opt_vardir =~ m,^/, or
            ($glob_win32 and $opt_vardir =~ m,^[a-z]:/,i) )
@@ -2383,12 +2383,12 @@ sub mysqld_arguments ($$$$$$) {
     if ( $type eq 'master' )
     {
       mtr_add_arg($args, "%s--debug=d:t:i:A,%s/log/master%s.trace",
-                  $prefix, $opt_vardir_unix, $sidx);
+                  $prefix, $opt_vardir_trace, $sidx);
     }
     if ( $type eq 'slave' )
     {
       mtr_add_arg($args, "%s--debug=d:t:i:A,%s/log/slave%s.trace",
-                  $prefix, $opt_vardir_unix, $sidx);
+                  $prefix, $opt_vardir_trace, $sidx);
     }
   }
 
@@ -2720,7 +2720,7 @@ sub run_mysqltest ($) {
   if ( $opt_debug )
   {
     $cmdline_mysqlcheck .=
-      " --debug=d:t:A,$opt_vardir_unix/log/mysqldump.trace";
+      " --debug=d:t:A,$opt_vardir_trace/log/mysqldump.trace";
   }
 
   my $cmdline_mysqldump= "$exe_mysqldump --no-defaults -uroot " .
@@ -2733,7 +2733,7 @@ sub run_mysqltest ($) {
   if ( $opt_debug )
   {
     $cmdline_mysqldump .=
-      " --debug=d:t:A,$opt_vardir_unix/log/mysqldump.trace";
+      " --debug=d:t:A,$opt_vardir_trace/log/mysqldump.trace";
   }
 
   my $cmdline_mysqlslap;
@@ -2747,7 +2747,7 @@ sub run_mysqltest ($) {
     if ( $opt_debug )
     {
       $cmdline_mysqlslap .=
-        " --debug=d:t:A,$opt_vardir_unix/log/mysqldump.trace";
+        " --debug=d:t:A,$opt_vardir_trace/log/mysqldump.trace";
     }
   }
 
@@ -2757,7 +2757,7 @@ sub run_mysqltest ($) {
   if ( $opt_debug )
   {
     $cmdline_mysqlimport .=
-      " --debug=d:t:A,$opt_vardir_unix/log/mysqlimport.trace";
+      " --debug=d:t:A,$opt_vardir_trace/log/mysqlimport.trace";
   }
 
   my $cmdline_mysqlshow= "$exe_mysqlshow -uroot " .
@@ -2766,7 +2766,7 @@ sub run_mysqltest ($) {
   if ( $opt_debug )
   {
     $cmdline_mysqlshow .=
-      " --debug=d:t:A,$opt_vardir_unix/log/mysqlshow.trace";
+      " --debug=d:t:A,$opt_vardir_trace/log/mysqlshow.trace";
   }
 
   my $cmdline_mysqlbinlog=
@@ -2777,7 +2777,7 @@ sub run_mysqltest ($) {
   if ( $opt_debug )
   {
     $cmdline_mysqlbinlog .=
-      " --debug=d:t:A,$opt_vardir_unix/log/mysqlbinlog.trace";
+      " --debug=d:t:A,$opt_vardir_trace/log/mysqlbinlog.trace";
   }
 
   my $cmdline_mysql=
@@ -2913,7 +2913,7 @@ sub run_mysqltest ($) {
 
   if ( $opt_debug )
   {
-    mtr_add_arg($args, "--debug=d:t:A,%s/log/mysqltest.trace", $opt_vardir_unix);
+    mtr_add_arg($args, "--debug=d:t:A,%s/log/mysqltest.trace", $opt_vardir_trace);
   }
 
   if ( $opt_ssl_supported )