merge

mysql-test/mysql-test-run.pl

@@ -2458,7 +2458,8 @@ sub setup_vardir() {
   mkpath("$opt_vardir/tmp");
   mkpath($opt_tmpdir) if $opt_tmpdir ne "$opt_vardir/tmp";
 
-  if ($master->[0]->{'path_sock'} !~ m/^$opt_tmpdir/)
+  # Set up link to master sock if not in var/tmp (not on Windows)
+  if (! $glob_win32 && $master->[0]->{'path_sock'} !~ m/^$opt_tmpdir/)
   {
     mtr_report("Symlinking $master->[0]->{'path_sock'}");
 	symlink($master->[0]->{'path_sock'}, "$opt_tmpdir/master.sock");