Commit 2ef9c1c1 authored by unknown's avatar unknown
Browse files

Merge mysqldev@win2003-x86:my/mysql-5.1-new 

into  mysql.com:/usr/local/mysql/mysql-5.1-win-src


mysql-test/mysql-test-run.pl:
  Auto merged
parents 3b69e5ec 421ae80b

mysql-test/mysql-test-run.pl

+4 −2
Original line number Diff line number Diff line
@@ -1088,7 +1088,8 @@ sub executable_setup () { 
    $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");

    $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");

    $exe_mysql_fix_system_tables=

      mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables");

      mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables",

                        "/usr/bin/false");

    $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools");

    $exe_ndb_mgm=        "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm";

  }
@@ -1104,7 +1105,8 @@ sub executable_setup () { 
    $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");

    $exe_mysql_fix_system_tables=

      mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables",

			"$glob_basedir/scripts/mysql_fix_privilege_tables");

			"$glob_basedir/scripts/mysql_fix_privilege_tables",

                        "/usr/bin/false");

    $exe_my_print_defaults=

      mtr_exe_exists("$path_client_bindir/my_print_defaults");