bzr commit into mysql-5.1-mtr branch (Bjorn.Munch:2864) Bug#49096

[Bjorn Munch]

#At file:///home/bm136801/my/embmut-51/ based on revid:bjorn.munch@stripped

 2864 Bjorn Munch	2009-11-26
      Bug #49096 mtr: --mem option should be ignored on Windows
      Ignored w/message in v1 and v2

    modified:
      mysql-test/lib/v1/mysql-test-run.pl
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/v1/mysql-test-run.pl'
--- a/mysql-test/lib/v1/mysql-test-run.pl	2008-11-14 08:45:32 +0000
+++ b/mysql-test/lib/v1/mysql-test-run.pl	2009-11-26 10:23:30 +0000
@@ -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
   # --------------------------------------------------------------------------

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-11-24 08:12:48 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-11-26 10:23:30 +0000
@@ -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
   # --------------------------------------------------------------------------


Attachment: [text/bzr-bundle] bzr/[e-mail]