Commit 0deb1f55 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


mysql-test/mysql-test-run.pl:
  Auto merged
parents 4e1bc5ab c2826d72
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -947,6 +947,7 @@ sub executable_setup () {
    $path_client_bindir= mtr_path_exists("$glob_basedir/bin");
    $exe_mysqlcheck=     mtr_exe_exists("$path_client_bindir/mysqlcheck");
    $exe_mysqldump=      mtr_exe_exists("$path_client_bindir/mysqldump");
    $exe_mysqlimport=    mtr_exe_exists("$path_client_bindir/mysqlimport");
    $exe_mysqlshow=      mtr_exe_exists("$path_client_bindir/mysqlshow");
    $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");
    $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");