Merge mysql.com:/usr/local/mysql/mysql-5.x-win-test-fixes

into  mysql.com:/usr/local/mysql/mysql-5.1-win-test-fixes


mysql-test/mysql-test-run.pl:
  Manual merge.

mysql-test/mysql-test-run.pl

@@ -947,7 +947,8 @@ sub executable_setup () {
     {
       $path_client_bindir= mtr_path_exists("$glob_basedir/client_release",
                                            "$glob_basedir/bin");
-      $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-nt",
+      $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-max",
+                                           "$path_client_bindir/mysqld-nt",
                                            "$path_client_bindir/mysqld",
                                            "$path_client_bindir/mysqld-debug",);
       $path_language=      mtr_path_exists("$glob_basedir/share/english/");