Skip to content

MDEV-40023 Clean up dead code in check_expected_crash_and_restart #5229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FarihaIS wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MDEV-40023 Clean up dead code in check_expected_crash_and_restart #5229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions mysql-test/include/start_mysqld.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ if (!$restart_noprint)

--let $restart_cmd= restart

if ($restart_bindir)
{
--let $restart_cmd= restart_bindir $restart_bindir
}

if ($restart_parameters)
{
--write_line "$restart_cmd: $restart_parameters" $_expect_file_name
Expand Down
22 changes: 8 additions & 14 deletions mysql-test/mariadb-test-run.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4840,30 +4840,24 @@ sub check_expected_crash_and_restart {
# test script to control when the server should start
# up again. Keep trying for up to 5s at a time.
my $last_line= mtr_lastlinesfromfile($expect_file, 1);
# Skip empty lines (partial write race)
next if $last_line =~ /^\s*$/;
if ($last_line =~ /^wait/ )
{
mtr_verbose("Test says wait before restart") if $waits == 0;
next;
}
delete $ENV{MTR_BINDIR_FORCED};

# Ignore any partial or unknown command
next unless $last_line =~ /^restart/;
# If last line begins "restart:", the rest of the line is read as
# extra command line options to add to the restarted mysqld.
# Anything other than 'wait' or 'restart:' (with a colon) will
# result in a restart with original mysqld options.
if ($last_line =~ /restart_bindir\s+(\S+)(:.+)?/) {
$ENV{MTR_BINDIR_FORCED}= $1;
if ($2) {
my @rest_opt= split(' ', $2);
$mysqld->{'restart_opts'}= \@rest_opt;
}
} elsif ($last_line =~ /restart:(.+)/) {
# Anything other than 'wait' or 'restart' will result in an error.
if ($last_line =~ /^restart:(.+)/) {
my @rest_opt= split(' ', $1);
$mysqld->{'restart_opts'}= \@rest_opt;
} else {
} elsif ($last_line =~ /^restart/) {
Comment thread
gkodinov marked this conversation as resolved.
delete $mysqld->{'restart_opts'};
} else {
mtr_error("Unknown command '$last_line' in expect file " .
"'$expect_file'");
}
unlink($expect_file);

Expand Down
Loading