database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
This commit is contained in:
unknown
2007-02-06 14:30:23 +01:00
parent e976ea37b0 04b5225122
commit 14e7f52fb2
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

@ -3600,13 +3600,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' )
{
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,
$opt_vardir, $sidx);
@ -3665,7 +3666,7 @@ sub mysqld_arguments ($$$$$) {
mtr_add_arg($args, "%s--datadir=%s", $prefix,
$slave->[$idx]->{'path_myddir'});
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,
$opt_vardir, $sidx); # FIXME use own dir for binlogs
@ -3802,6 +3803,10 @@ sub mysqld_arguments ($$$$$) {
{
$found_skip_core= 1;
}
elsif ($skip_binlog and mtr_match_prefix($arg, "--binlog-format"))
{
; # Dont add --binlog-format when running without binlog
}
else
{
mtr_add_arg($args, "%s%s", $prefix, $arg);

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

@ -13,5 +13,4 @@
im_daemon_life_cycle : Bug#24415 see note: [19 Dec 23:17] Trudy Pelzer
ndb_load : Bug#17233
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