WL#4350 Options in my.cnf style config file should not start with --

mysql-test/lib/My/Config.pm

@@ -27,6 +27,16 @@ sub value {
   return $self->{value};
 }
 
+sub option {
+  my ($self)= @_;
+  my $name=  $self->{name};
+  my $value= $self->{value};
+
+  my $opt= $name;
+  $opt= "$name=$value" if ($value);
+  $opt= "--$opt" unless ($opt =~ /^--/);
+  return $opt;
+}
 
 package My::Config::Group;
 

mysql-test/lib/mtr_cases.pm

@@ -397,7 +397,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->option());
 	}
 	push(@combinations, $comb);
       }

mysql-test/suite/binlog/combinations

 [row]
---binlog-format=row
+binlog-format=row
 
 [stmt]
---binlog-format=statement
+binlog-format=statement
 
 [mix]
---binlog-format=mixed
+binlog-format=mixed

mysql-test/suite/bugs/combinations

 [row]
---binlog-format=row
+binlog-format=row
 
 [stmt]
---binlog-format=statement
+binlog-format=statement
 
 [mix]
---binlog-format=mixed
+binlog-format=mixed

mysql-test/suite/rpl/combinations

 [row]
---binlog-format=row
+binlog-format=row
 
 [stmt]
---binlog-format=statement
+binlog-format=statement
 
 [mix]
---binlog-format=mixed
+binlog-format=mixed