Commit 6c21bdb9 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
parents 91c9600b 72695c3f

mysql-test/lib/mtr_misc.pl

+16 −2
Original line number Diff line number Diff line
@@ -81,9 +81,16 @@ sub mtr_path_exists (@) { 


sub mtr_script_exists (@) {

  foreach my $path ( @_ )

  {

    if($::glob_win32)

    {

      return $path if -f $path;

    }

    else

    {

      return $path if -x $path;

    }

  }

  if ( @_ == 1 )

  {

    mtr_error("Could not find $_[0]");
@@ -98,9 +105,16 @@ sub mtr_exe_exists (@) { 
  my @path= @_;

  map {$_.= ".exe"} @path if $::glob_win32;

  foreach my $path ( @path )

  {

    if($::glob_win32)

    {

      return $path if -f $path;

    }

    else

    {

      return $path if -x $path;

    }

  }

  if ( @path == 1 )

  {

    mtr_error("Could not find $path[0]");