diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-09-14 11:01:23 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-09-14 11:01:23 +0200 |
| commit | 2e48f717596508c47e198f0fcd61d0b031459700 (patch) | |
| tree | 08373e85b5c6ef65b96847df2c758fc02197a743 | |
| parent | 2dd39f521416c5b8b2eac7441c2c64cc57baa481 (diff) | |
| parent | 9a204629f986b06dab6900459f6bc7be317a515c (diff) | |
| download | mariadb-git-2e48f717596508c47e198f0fcd61d0b031459700.tar.gz | |
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
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 7bca21e3ff6..f0eb7f3bda4 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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 |