diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-03 16:15:40 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-03 16:15:40 +0200 |
| commit | ca8c3be47db39319ecdc915bd50f25b5d334c2b1 (patch) | |
| tree | f49f621232546a95330267bf6746bdd5bf5fd976 /mysql-test/mysql-test-run.pl | |
| parent | 9949ab93939369fd4dacab859428c1c4effd5cca (diff) | |
| parent | 9d036f840ad5925edac419c0cb6ce838ad0f3a2f (diff) | |
| download | mariadb-git-ca8c3be47db39319ecdc915bd50f25b5d334c2b1.tar.gz | |
Merge 10.4 into 10.5
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 cf7365bbc02..0dcdfc0b64c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -5573,12 +5573,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; } |