Commit 1c756c04 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents 92d9f2ca 2aa1a04c

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ sub executable_setup () { 
    $exe_mysqlbinlog=       "$path_client_bindir/mysqlbinlog";

    $exe_mysqladmin=        "$path_client_bindir/mysqladmin";

    $exe_mysql=             "$path_client_bindir/mysql";

    $exe_mysql_fix_system_tables= "$glob_basedir/scripts/mysql_fix_privilege_tables";

    $exe_mysql_fix_system_tables= "$path_client_bindir/mysql_fix_privilege_tables";



    if ( -d "$glob_basedir/share/mysql/english" )

    {