Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-maint2


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl

@@ -3006,7 +3006,7 @@ sub after_failure ($) {
   my $save_dir= "$opt_vardir/log/";
   $save_dir.= $tinfo->{name};
   # Add combination name if any
-  $save_dir.= "_$tinfo->{combination}"
+  $save_dir.= "-$tinfo->{combination}"
     if defined $tinfo->{combination};
 
   mkpath($save_dir) if ! -d $save_dir;