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

Only skip restart(and use dynamic binlog switch) if the next test has 'binlog_format_switch' set

Browse Source
This commit is contained in:
msvensson@pilot.mysql.com
2007-12-13 11:39:00 +01:00
parent 864989d97f
commit 4930a27d6c
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2818,16 +2818,15 @@ sub server_need_restart {
! mtr_same_opts($started_opts, $extra_opt) ) ! mtr_same_opts($started_opts, $extra_opt) )
{ {
# Check if diff is binlog format only # 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); my @diff_opts= mtr_diff_opts($started_opts, $extra_opt);
if (@diff_opts == 2 and if (@diff_opts == 2 and
$diff_opts[0] =~/^--binlog-format=/ 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 ", mtr_verbose("Using dynamic switch of binlog format from ",
$diff_opts[0],"to", $diff_opts[1]); $diff_opts[0],"to", $diff_opts[1]);
die "Binlog format to switch to is not set"
unless defined $tinfo->{binlog_format_switch};
} }
else else
{ {