summaryrefslogtreecommitdiff
path: root/mysql-test/lib/My/ConfigFactory.pm
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2017-11-05 01:30:40 +0200
committerElena Stepanova <elenst@montyprogram.com>2017-11-05 01:30:40 +0200
commitd78273d1e53308c8fe78b9e067a88c43bd05e540 (patch)
tree1bfb3927c51945d70a785829b6d8c4f4b14e668d /mysql-test/lib/My/ConfigFactory.pm
parent737a4da94ae9b25a7ebe828c5b35a1ce4acf03d6 (diff)
downloadmariadb-git-bb-10.0-elenst.tar.gz
MDEV-14288 Add MTR option to run tests with real server defaultsbb-10.0-elenst
Diffstat (limited to 'mysql-test/lib/My/ConfigFactory.pm')
-rw-r--r--mysql-test/lib/My/ConfigFactory.pm4
1 files changed, 3 insertions, 1 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=