Commit bc6a7ac8 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents 265fb22e c8ac2346

mysql-test/mysql-test-run.pl

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

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

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

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

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

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



  $ENV{'MYSQL'}= $cmdline_mysql;
@@ -3725,7 +3726,6 @@ sub run_check_testcase ($$) { 


sub run_mysqltest ($) {

  my ($tinfo)= @_;



  my $exe= $exe_mysqltest;

  my $args;