mtr: include restart_opts in --verbose-restart

9f7fcb9f · Sergei Golubchik · aade6e53 · 9f7fcb9f
Commit 9f7fcb9f authored Dec 23, 2019 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/mysql-test-run.pl mysql-test/mysql-test-run.pl +2 -2

No files found.
--- 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;
      }