bzr push into mysql-5.1 branch (msvensson:2695 to 2696) Bug#40742

[Magnus Svensson]

 2696 Magnus Svensson	2008-11-14
      Bug#40742 MTR_VERSION=1 perl mysql-test-run.pl --start-and-exit rpl_alter does not work
modified:
  mysql-test/lib/v1/mtr_cases.pl

 2695 Magnus Svensson	2008-11-14
      Bug#40705 mtr's check-warnings fails sporadically in pushbuild
       - Change the logic slightly for when and how errors from
         check-warnings and check-testcase are reported. The prevoius logic
         reporting testfailed twice and that might have caused this.
       - Also print result code returned from mysqltest when it is "unexpected" 
modified:
  mysql-test/mysql-test-run.pl

=== modified file 'mysql-test/lib/v1/mtr_cases.pl'
--- a/mysql-test/lib/v1/mtr_cases.pl	2008-11-14 08:45:32 +0000
+++ b/mysql-test/lib/v1/mtr_cases.pl	2008-11-14 14:39:12 +0000
@@ -369,7 +369,7 @@ sub collect_one_suite($)
 	my $comb= {};
 	$comb->{name}= $group->name();
         foreach my $option ( $group->options() ) {
-	  push(@{$comb->{comb_opt}}, $option->name()."=".$option->value());
+	  push(@{$comb->{comb_opt}}, "--".$option->name()."=".$option->value());
 	}
 	push(@combinations, $comb);
       }