database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Bug#24805 mtr.pl can't handle test with --disable-log-bin

Browse Source 
- Don't give mysqld the --log-bin argument if .opt file
  contains --skip-log-bin
- Enable flush2 test
This commit is contained in:
msvensson@pilot.mysql.com
2007-02-06 14:19:07 +01:00
parent b0977714a8
commit 958308a5cf
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/mysql-test-run.pl
View File

@@ -3554,13 +3554,14 @@ sub mysqld_arguments ($$$$$) {
} }
} }
my $pidfile; # Check if "extra_opt" contains --skip-log-bin
my $skip_binlog= grep('--skip-log-bin', @$extra_opt);
if ( $type eq 'master' ) if ( $type eq 'master' )
{ {
my $id= $idx > 0 ? $idx + 101 : 1; my $id= $idx > 0 ? $idx + 101 : 1;
if (! $opt_skip_master_binlog) if (! ($opt_skip_master_binlog || $skip_binlog) )
{ {
mtr_add_arg($args, "%s--log-bin=%s/log/master-bin%s", $prefix, mtr_add_arg($args, "%s--log-bin=%s/log/master-bin%s", $prefix,
$opt_vardir, $sidx); $opt_vardir, $sidx);
@@ -3619,7 +3620,7 @@ sub mysqld_arguments ($$$$$) {
mtr_add_arg($args, "%s--datadir=%s", $prefix, mtr_add_arg($args, "%s--datadir=%s", $prefix,
$slave->[$idx]->{'path_myddir'}); $slave->[$idx]->{'path_myddir'});
mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix); mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix);
if (! $opt_skip_slave_binlog) if (! ( $opt_skip_slave_binlog || $skip_binlog ))
{ {
mtr_add_arg($args, "%s--log-bin=%s/log/slave%s-bin", $prefix, mtr_add_arg($args, "%s--log-bin=%s/log/slave%s-bin", $prefix,
$opt_vardir, $sidx); # FIXME use own dir for binlogs $opt_vardir, $sidx); # FIXME use own dir for binlogs
@@ -3756,6 +3757,10 @@ sub mysqld_arguments ($$$$$) {
{ {
$found_skip_core= 1; $found_skip_core= 1;
} }
elsif ($skip_binlog and mtr_match_prefix($arg, "--binlog-format"))
{
; # Dont add --binlog-format when running without binlog
}
else else
{ {
mtr_add_arg($args, "%s%s", $prefix, $arg); mtr_add_arg($args, "%s%s", $prefix, $arg);

1
mysql-test/t/disabled.def
View File

@@ -12,5 +12,4 @@
ndb_load : Bug#17233 ndb_load : Bug#17233
user_limits : Bug#23921 random failure of user_limits.test user_limits : Bug#23921 random failure of user_limits.test
flush2 : Bug#24805 Pushbuild can't handle test with --disable-log-bin

2
mysql-test/t/flush2-master.opt
View File

@@ -1 +1 @@
--disable-log-bin --skip-log-bin