per-file combinations

mysql-test/lib/My/Config.pm

@@ -165,6 +165,8 @@ sub value {
 }
 
 
+sub auto { 0 };
+
 #
 # Return value for an option if it exist
 #
@@ -189,6 +191,8 @@ sub new {
   bless My::Config::Group->new($group_name), $class;
 }
 
+sub auto { 1 };
+
 #
 # Return value for an option in the group, fail if it does not exist
 #
@@ -214,6 +218,8 @@ use strict;
 use warnings;
 use Carp;
 
+sub auto { 1 };
+
 sub new {
   my ($class, $group_name)= @_;
   bless My::Config::Group->new($group_name), $class;

mysql-test/lib/My/Test.pm

@@ -37,8 +37,8 @@ sub new {
 
 sub fullname {
   my ($self)= @_;
-  $self->{name} . (defined $self->{combination}
-                   ? " '$self->{combination}'"
+  $self->{name} . (defined $self->{combinations}
+                   ? " '" . join(',', sort @{$self->{combinations}}) . "'"
                    : "")
 }
 

mysql-test/lib/mtr_misc.pl

@@ -263,6 +263,11 @@ sub mtr_wait_lock_file {
   return ($waited);
 }
 
+sub uniq(@) {
+  my %seen = map { $_ => $_ } @_;
+  values %seen;
+}
+
 # Simple functions to start and check timers (have to be actively polled)
 # Timer can be "killed" by setting it to 0
 

mysql-test/mysql-test-run.pl

@@ -5101,8 +5101,8 @@ sub after_failure ($) {
   my $save_dir= "$opt_vardir/log/";
   $save_dir.= $tinfo->{name};
   # Add combination name if any
-  $save_dir.= "-$tinfo->{combination}"
-    if defined $tinfo->{combination};
+  $save_dir.= '-' . join(',', sort @{$tinfo->{combinations}})
+    if defined $tinfo->{combinations};
 
   # Save savedir  path for server
   $tinfo->{savedir}= $save_dir;

mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test

@@ -22,10 +22,10 @@
 #  http://dev.mysql.com/doc/refman/5.1/en/sql-syntax-data-definition.html
 #
 
-source include/master-slave.inc;
 #CREATE TEMPORARY TABLE statements are not binlogged in row mode,
 #So it must be test by itself.
 source include/have_binlog_format_mixed_or_statement.inc;
+source include/master-slave.inc;
 disable_warnings;
 
 DROP DATABASE IF EXISTS mysqltest;