diff options
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/My/ConfigFactory.pm | 4 | ||||
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index b8ce038f23e..dcdb534f97c 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -37,7 +37,9 @@ sub add_opt_values { # add auto-options $config->insert('OPT', 'port' => sub { fix_port($self, $config) }); - $config->insert('mysqld', "loose-skip-plugin-$_" => undef) for (@::optional_plugins); + if (!$::opt_default_server_options) { + $config->insert('mysqld', "loose-skip-plugin-$_" => undef) for (@::optional_plugins); + } } my @pre_rules= diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 38c52b705f6..26a4edda3b2 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -876,7 +876,10 @@ sub collect_one_test_case { if (not $config) { # Suite has no config, autodetect which one to use - if ($tinfo->{rpl_test}) { + if ($::opt_default_server_options) { + $config= "include/hard_default_my.cnf"; + } + elsif ($tinfo->{rpl_test}) { $config= "suite/rpl/my.cnf"; } else { $config= "include/default_my.cnf"; |