Commit 2e48f717 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/my50-netware-mtr 

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents 2dd39f52 9a204629

mysql-test/mysql-test-run.pl

+0 −4
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ our @mysqld_src_dirs= 
our $glob_win32=                  0; # OS and native Win32 executables

our $glob_win32_perl=             0; # ActiveState Win32 Perl

our $glob_cygwin_perl=            0; # Cygwin Perl

our $glob_cygwin_shell=           undef;

our $glob_mysql_test_dir=         undef;

our $glob_mysql_bench_dir=        undef;

our $glob_hostname=               undef;
@@ -464,10 +463,7 @@ sub initial_setup () { 
  {

    # Windows programs like 'mysqld' needs Windows paths

    $glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`;

    my $shell= $ENV{'SHELL'} || "/bin/bash";

    $glob_cygwin_shell=   `cygpath -w "$shell"`; # The Windows path c:\...

    chomp($glob_mysql_test_dir);

    chomp($glob_cygwin_shell);

  }

  $glob_basedir=         dirname($glob_mysql_test_dir);

  $glob_mysql_bench_dir= "$glob_basedir/mysql-bench"; # FIXME make configurable