Commit 618c8c87 authored by unknown's avatar unknown

Merge pilot.mysql.com:/home/msvensson/mysql/bug24805/my50-bug24805

into  pilot.mysql.com:/home/msvensson/mysql/bug24805/my51-bug24805


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge
parents 9e639bac 04b52251
...@@ -3615,13 +3615,14 @@ sub mysqld_arguments ($$$$$) { ...@@ -3615,13 +3615,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);
...@@ -3683,7 +3684,7 @@ sub mysqld_arguments ($$$$$) { ...@@ -3683,7 +3684,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
...@@ -3820,6 +3821,10 @@ sub mysqld_arguments ($$$$$) { ...@@ -3820,6 +3821,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);
......
...@@ -36,7 +36,6 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb ...@@ -36,7 +36,6 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb
#ndb_binlog_discover : bug#21806 2006-08-24 #ndb_binlog_discover : bug#21806 2006-08-24
#ndb_autodiscover3 : bug#21806 #ndb_autodiscover3 : bug#21806
flush2 : Bug#24805 Pushbuild can't handle test with --disable-log-bin
mysql_upgrade : Bug#25074 mysql_upgrade gives inconsisten results mysql_upgrade : Bug#25074 mysql_upgrade gives inconsisten results
plugin : Bug#25659 memory leak via "plugins" test plugin : Bug#25659 memory leak via "plugins" test
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment