diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-03 13:44:16 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-03 13:44:16 +0100 |
| commit | 7753a290645ca4af8b11f2fff1f47c3a64d45732 (patch) | |
| tree | e421eaafa2bd26bfe8ba21fb76a13b017348d2cd /mysql-test/mysql-test-run.pl | |
| parent | 02e30069573b09f5d26b6c357cd8aee3e876385a (diff) | |
| parent | b35290e19bda02257e4cf6c6acc6133b4e3f2372 (diff) | |
| download | mariadb-git-7753a290645ca4af8b11f2fff1f47c3a64d45732.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 566437b2c32..60de682806b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -5530,12 +5530,12 @@ sub server_need_restart { { delete $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; } |