Commit ac7640d6 authored by unknown's avatar unknown
Browse files

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.
parents 14c38f00 3f591866

mysql-test/mysql-test-run.pl

+2 −1
Original line number Diff line number Diff line
@@ -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/");