diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-02-22 14:52:11 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-02-22 14:52:11 +0100 |
| commit | 38e811b83999c06d8d887c76ceb47b7de229da43 (patch) | |
| tree | 5d8f58b7cdfa07f84d1ad9d29e8f802a03399c43 /mysql-test/lib/v1/mysql-test-run.pl | |
| parent | 5181551dee3306bcee410a31738e1a3ee9c2c501 (diff) | |
| parent | c4de42d6f9c9310c916e3b254fbb741851586bf4 (diff) | |
| download | mariadb-git-38e811b83999c06d8d887c76ceb47b7de229da43.tar.gz | |
merge from 5.1-mtr
Diffstat (limited to 'mysql-test/lib/v1/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index caece1d355d..5d06d9c4dd8 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 # -------------------------------------------------------------------------- |