Commit 6c21bdb9 authored by unknown's avatar unknown

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

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

parents 91c9600b 72695c3f
...@@ -81,9 +81,16 @@ sub mtr_path_exists (@) { ...@@ -81,9 +81,16 @@ sub mtr_path_exists (@) {
sub mtr_script_exists (@) { sub mtr_script_exists (@) {
foreach my $path ( @_ ) foreach my $path ( @_ )
{
if($::glob_win32)
{
return $path if -f $path;
}
else
{ {
return $path if -x $path; return $path if -x $path;
} }
}
if ( @_ == 1 ) if ( @_ == 1 )
{ {
mtr_error("Could not find $_[0]"); mtr_error("Could not find $_[0]");
...@@ -98,9 +105,16 @@ sub mtr_exe_exists (@) { ...@@ -98,9 +105,16 @@ sub mtr_exe_exists (@) {
my @path= @_; my @path= @_;
map {$_.= ".exe"} @path if $::glob_win32; map {$_.= ".exe"} @path if $::glob_win32;
foreach my $path ( @path ) foreach my $path ( @path )
{
if($::glob_win32)
{
return $path if -f $path;
}
else
{ {
return $path if -x $path; return $path if -x $path;
} }
}
if ( @path == 1 ) if ( @path == 1 )
{ {
mtr_error("Could not find $path[0]"); mtr_error("Could not find $path[0]");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment