diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-11-26 12:08:18 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-11-26 12:08:18 +0100 |
| commit | eb334fd9627b6c4d4e6401d2049cb3385b796926 (patch) | |
| tree | f0947f64ba98af0cc24b23b554dd633cb3bd5b41 /mysql-test/mysql-test-run.pl | |
| parent | e536016cbebfb48147ffc6ae8fd786e209cb1024 (diff) | |
| parent | 16c8611bb0ff3825a7edeb46cd69c722b362ad36 (diff) | |
| download | mariadb-git-eb334fd9627b6c4d4e6401d2049cb3385b796926.tar.gz | |
merge 48250, 48918, 49096
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a1144f78617..307d5bb68d0 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1080,6 +1080,11 @@ sub command_line_setup { } } + if (IS_WINDOWS and defined $opt_mem) { + mtr_report("--mem not supported on Windows, ignored"); + $opt_mem= undef; + } + # -------------------------------------------------------------------------- # Check if we should speed up tests by trying to run on tmpfs # -------------------------------------------------------------------------- @@ -3896,7 +3901,7 @@ sub check_expected_crash_and_restart { foreach my $mysqld ( mysqlds() ) { - next unless ( $mysqld->{proc} eq $proc ); + next unless ( $mysqld->{proc} and $mysqld->{proc} eq $proc ); # Check if crash expected by looking at the .expect file # in var/tmp |