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

[Bjorn Munch]

#At file:///home/bm136801/my/spaceplug-51/ based on revid:magnus.blaudd@stripped

 2841 Bjorn Munch	2009-10-08
      Bug #46625 Pushbuild2: does not notice test failure in "Innodb Plugin" mode
      Disallow (and don't use) space in combination names

    modified:
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2009-10-02 08:36:38 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2009-10-08 09:14:42 +0000
@@ -539,11 +539,11 @@ sub collect_one_suite($)
       push(@{$new_test->{slave_opt}}, "--plugin_load=innodb=$plugin_filename;innodb_locks=$plugin_filename");
       if ($new_test->{combination})
       {
-        $new_test->{combination}.= ' + InnoDB plugin';
+        $new_test->{combination}.= '+innodb_plugin';
       }
       else
       {
-        $new_test->{combination}= 'InnoDB plugin';
+        $new_test->{combination}= 'innodb_plugin';
       }
       push(@new_cases, $new_test);
     }

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-10-08 08:39:15 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-10-08 09:14:42 +0000
@@ -3247,6 +3247,12 @@ sub run_testcase ($) {
 
   mtr_verbose("Running test:", $tinfo->{name});
 
+  # Allow only alpanumerics pluss _ - + . in combination names
+  my $combination= $tinfo->{combination};
+  if ($combination && $combination !~ /^\w[\w-\.\+]+$/)
+  {
+    mtr_error("Combination '$combination' contains illegal characters");
+  }
   # -------------------------------------------------------
   # Init variables that can change between each test case
   # -------------------------------------------------------


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