Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl

into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl

mysql-test/include/have_binlog_format_row_or_statement.inc

+--source include/have_log_bin.inc
+
+-- require r/have_binlog_format_statement.require
+--disable_query_log
+--replace_result ROW STATEMENT
+show variables like "binlog_format";
+--enable_query_log

mysql-test/lib/mtr_cases.pl

@@ -229,24 +229,27 @@ sub collect_one_suite($$)
   my $testdir= "$suitedir/t";
   my $resdir=  "$suitedir/r";
 
-  if (!@::opt_combination) 
+  if (!defined $::opt_record and !defined $::opt_skip_combination)
   {
-    # Read combinations file
-    if ( open(COMB,$combination_file) )
+    if (!@::opt_combination) 
     {
-      while (<COMB>)
+      # Read combinations file
+      if ( open(COMB,$combination_file) )
       {
-        chomp;
-        s/\ +/ /g;
-        push (@$combinations, $_) unless ($_ eq '');
+        while (<COMB>)
+        {
+          chomp;
+          s/\ +/ /g;
+          push (@$combinations, $_) unless ($_ eq '');
+        }
+        close COMB;
       }
-      close COMB;
     }
-  }
-  else
-  {
-    # take the combination from command-line
-    @$combinations = @::opt_combination;
+    else
+    {
+      # take the combination from command-line
+      @$combinations = @::opt_combination;
+    }
   }
   # Remember last element position
   my $begin_index = $#{@$cases} + 1;

mysql-test/mysql-test-run.pl

@@ -165,6 +165,7 @@ our $opt_small_bench= 0;
 our $opt_big_test= 0;
 
 our @opt_combination;
+our $opt_skip_combination;
 
 our @opt_extra_mysqld_opt;
 
@@ -532,6 +533,7 @@ sub command_line_setup () {
              'skip-test=s'              => \$opt_skip_test,
              'big-test'                 => \$opt_big_test,
              'combination=s'            => \@opt_combination,
+             'skip-combination'         => \$opt_skip_combination,
 
              # Specify ports
              'master_port=i'            => \$opt_master_myport,
@@ -5179,6 +5181,7 @@ Options to control what test suites or cases to run
                         checked from test cases.
   combination="ARG1 .. ARG2" Specify a set of "mysqld" arguments for one 
                         combination. 
+  skip-combination      Skip any combination options and combinations files
 
 Options that specify ports