summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-12-23 21:39:10 +0100
committerSergei Golubchik <serg@mariadb.org>2019-12-23 21:39:10 +0100
commit9f7fcb9f25238945e4fb8cc1a1f98e56457b714f (patch)
treee3f6b653555f464c1b40bb8b9a555d83a8753d03
parentaade6e53d398dd287ca7e771191c9975099b4fa1 (diff)
downloadmariadb-git-9f7fcb9f25238945e4fb8cc1a1f98e56457b714f.tar.gz
mtr: include restart_opts in --verbose-restart
-rwxr-xr-xmysql-test/mysql-test-run.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 77c307727a6..07cd4fa5392 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -5294,12 +5294,12 @@ sub server_need_restart {
exists $server->{'restart_opts'})
{
my $use_dynamic_option_switch= 0;
- delete $server->{'restart_opts'};
+ my $restart_opts = delete $server->{'restart_opts'} || [];
if (!$use_dynamic_option_switch)
{
mtr_verbose_restart($server, "running with different options '" .
join(" ", @{$extra_opts}) . "' != '" .
- join(" ", @{$started_opts}) . "'" );
+ join(" ", @{$started_opts}, @{$restart_opts}) . "'" );
return 1;
}