diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-11-26 11:23:30 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-11-26 11:23:30 +0100 |
| commit | 22d80703efc8b1f548bce62dd2e785a83a3100ba (patch) | |
| tree | b6ca0d75406f96651f1edf951468c6d2e5e2686b | |
| parent | 69c540588a627bad4875373953b2923d840a2c25 (diff) | |
| download | mariadb-git-22d80703efc8b1f548bce62dd2e785a83a3100ba.tar.gz | |
Bug #49096 mtr: --mem option should be ignored on Windows
Ignored w/message in v1 and v2
| -rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 5 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index 86ad5c485c1..9630c65ade4 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -905,6 +905,11 @@ sub command_line_setup () { mtr_report("Using default engine '$used_default_engine'") if defined $used_default_engine; + if ($glob_win32 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 # -------------------------------------------------------------------------- diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2147b4ae7a7..e7f8e90dc44 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 # -------------------------------------------------------------------------- |