Backport fix for finding executables from 5.0

37be9fa3 · msvensson@neptunus.(none) · a86f035a · 37be9fa3
Commit 37be9fa3 authored Aug 25, 2006 by msvensson@neptunus.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 2 deletions

mysql-test/lib/mtr_misc.pl mysql-test/lib/mtr_misc.pl +16 -2

No files found.
--- a/mysql-test/lib/mtr_misc.pl
+++ b/mysql-test/lib/mtr_misc.pl
@@ -82,7 +82,14 @@ sub mtr_path_exists (@) {
 sub mtr_script_exists (@) {
  foreach my $path ( @_ )
  {
-    return $path if -x $path;
+    if($::glob_win32)
+    {
+      return $path if -f $path;
+    }
+    else
+    {
+      return $path if -x $path;
+    }
  }
  if ( @_ == 1 )
  {
@@ -99,7 +106,14 @@ sub mtr_exe_exists (@) {
  map {$_.= ".exe"} @path if $::glob_win32;
  foreach my $path ( @path )
  {
-    return $path if -x $path;
+    if($::glob_win32)
+    {
+      return $path if -f $path;
+    }
+    else
+    {
+      return $path if -x $path;
+    }
  }
  if ( @path == 1 )
  {