mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Only skip restart(and use dynamic binlog switch) if the next test has 'binlog_format_switch' set
This commit is contained in:
parent
864989d97f
commit
4930a27d6c
1 changed files with 3 additions and 4 deletions
|
@ -2818,16 +2818,15 @@ sub server_need_restart {
|
|||
! mtr_same_opts($started_opts, $extra_opt) )
|
||||
{
|
||||
# Check if diff is binlog format only
|
||||
# and the next test has $binlog_format_switch set
|
||||
my @diff_opts= mtr_diff_opts($started_opts, $extra_opt);
|
||||
if (@diff_opts == 2 and
|
||||
$diff_opts[0] =~/^--binlog-format=/ and
|
||||
$diff_opts[1] =~/^--binlog-format=/)
|
||||
$diff_opts[1] =~/^--binlog-format=/ and
|
||||
defined $tinfo->{binlog_format_switch})
|
||||
{
|
||||
mtr_verbose("Using dynamic switch of binlog format from ",
|
||||
$diff_opts[0],"to", $diff_opts[1]);
|
||||
|
||||
die "Binlog format to switch to is not set"
|
||||
unless defined $tinfo->{binlog_format_switch};
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue