diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-15 14:34:50 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-15 14:34:50 +0200 |
| commit | 0dae68973c3b90b54efd899876d8e4737e26062a (patch) | |
| tree | 479f1225cdd973639b7497a235fd23ba622cfc55 /mysql-test | |
| parent | 0deefdd3a7e90add2aacfe6c88fe2f07705be525 (diff) | |
| parent | 2e48f717596508c47e198f0fcd61d0b031459700 (diff) | |
| download | mariadb-git-0dae68973c3b90b54efd899876d8e4737e26062a.tar.gz | |
Merge msvensson.mysql.internal:mysql/mysql-5.0-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'mysql-test')
| -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 |