1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Magnus Svensson 2008-09-05 15:31:09 +02:00
parent ee1c00d97d
commit c11e919980
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/lib/My/Config.pm
View File

@ -27,6 +27,16 @@ sub value {
return $self->{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; package My::Config::Group;

2
mysql-test/lib/mtr_cases.pm
View File

@ -397,7 +397,7 @@ sub collect_one_suite($)
my $comb= {}; my $comb= {};
$comb->{name}= $group->name(); $comb->{name}= $group->name();
foreach my $option ( $group->options() ) { foreach my $option ( $group->options() ) {
push(@{$comb->{comb_opt}}, $option->name()."=".$option->value()); push(@{$comb->{comb_opt}}, $option->option());
} }
push(@combinations, $comb); push(@combinations, $comb);
} }

6
mysql-test/suite/binlog/combinations
View File

@ -1,8 +1,8 @@
[row] [row]
--binlog-format=row binlog-format=row
[stmt] [stmt]
--binlog-format=statement binlog-format=statement
[mix] [mix]
--binlog-format=mixed binlog-format=mixed

6
mysql-test/suite/bugs/combinations
View File

@ -1,8 +1,8 @@
[row] [row]
--binlog-format=row binlog-format=row
[stmt] [stmt]
--binlog-format=statement binlog-format=statement
[mix] [mix]
--binlog-format=mixed binlog-format=mixed

6
mysql-test/suite/rpl/combinations
View File

@ -1,8 +1,8 @@
[row] [row]
--binlog-format=row binlog-format=row
[stmt] [stmt]
--binlog-format=statement binlog-format=statement
[mix] [mix]
--binlog-format=mixed binlog-format=mixed