diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-24 14:43:29 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-24 14:43:29 +0200 |
| commit | 25161e6219de4a65b7f8776771bad2af6eb0446e (patch) | |
| tree | 28a3488cb929d63620d81d8ce4e0f42d0540ad65 /mysql-test/mysql-test-run.pl | |
| parent | 7930ab7e3326408e6b4d18ca057db93a8b61cc49 (diff) | |
| parent | 65350042a42b46e63d24e0e84453619d57d4e203 (diff) | |
| download | mariadb-git-25161e6219de4a65b7f8776771bad2af6eb0446e.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index f428f16940f..4122d51fa70 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -5270,6 +5270,7 @@ sub server_need_restart { exists $server->{'restart_opts'}) { my $use_dynamic_option_switch= 0; + delete $server->{'restart_opts'}; if (!$use_dynamic_option_switch) { mtr_verbose_restart($server, "running with different options '" . |