diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-03 12:40:38 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-03 12:40:38 +0100 |
| commit | b35290e19bda02257e4cf6c6acc6133b4e3f2372 (patch) | |
| tree | e0d986b1156ceb3c03209c3bef9989bc7040553f /mysql-test/mysql-test-run.pl | |
| parent | ef1e488be369b3d3c7eb26cfba1f44840221d502 (diff) | |
| parent | 4d7f0735067260bfc600c85e1574b7c708180fc2 (diff) | |
| download | mariadb-git-b35290e19bda02257e4cf6c6acc6133b4e3f2372.tar.gz | |
Merge branch '10.1' into 10.2
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 61231628b40..adc693bb29d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -5514,12 +5514,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; } |