summaryrefslogtreecommitdiff
path: root/mysql-test/lib/My/ConfigFactory.pm
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2020-04-08 15:25:04 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2020-04-14 12:08:30 +0300
commit8447edb7473c5532ecb2544ce6d00d5a868f5bd5 (patch)
tree8251aa769cbfcf6a47e906ab773a952aec74d351 /mysql-test/lib/My/ConfigFactory.pm
parent609a9312dc8b2548c6b68c927edd997a80be2488 (diff)
downloadmariadb-git-8447edb7473c5532ecb2544ce6d00d5a868f5bd5.tar.gz
Specify a new client_plugindir path, to be used during testing
When testing installed packages, the client (mariadb or mysql) can have plugins stored in a separate location compared to server. This change ensures that the correct paths are used for the plugin-dir directive in the my.cnf generated by mysql-test-run. The directives in my.cnf will be replaced like so: [client] plugin-dir=$client_plugindir [mysqld] plugin-dir=$plugindir where $<variable-name> corresponds to the variable name in mtr.
Diffstat (limited to 'mysql-test/lib/My/ConfigFactory.pm')
-rw-r--r--mysql-test/lib/My/ConfigFactory.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm
index 261de37ab54..db5c1aa1875 100644
--- a/mysql-test/lib/My/ConfigFactory.pm
+++ b/mysql-test/lib/My/ConfigFactory.pm
@@ -216,6 +216,7 @@ my @mysqld_rules=
my @client_rules=
(
{ 'character-sets-dir' => \&fix_charset_dir },
+ { 'plugin-dir' => sub { $::client_plugindir } },
);