Commit cbafa0c6 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/work/my50-work 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 3bbe813a a5576da7

mysql-test/mysql-test-run.pl

+2 −1
Original line number Diff line number Diff line
@@ -2897,7 +2897,8 @@ sub run_mysqltest ($) { 
  my $cmdline_mysql=

    "$exe_mysql --host=localhost  --user=root --password= " .

    "--port=$master->[0]->{'path_myport'} " .

    "--socket=$master->[0]->{'path_mysock'}";

    "--socket=$master->[0]->{'path_mysock'} ".

    "--character-sets-dir=$path_charsetsdir";



  my $cmdline_mysql_client_test=

    "$exe_mysql_client_test --no-defaults --testcase --user=root --silent " .