summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-05-19 12:44:15 +0000
committerSergei Golubchik <serg@mariadb.org>2018-11-12 11:46:13 +0100
commit4f9c44ed39af0b5531dfcc30d0037c1c71b8aaa6 (patch)
treeee1eba3a0e7a3f1c79f9518b0e052324f919bb13
parent3f10cbf3e49a7e44429f69b9d74e74eefd8f97e4 (diff)
downloadmariadb-git-4f9c44ed39af0b5531dfcc30d0037c1c71b8aaa6.tar.gz
adjust MTR code after C/C changed the location of plugin libraries
-rwxr-xr-xmysql-test/mysql-test-run.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index b317be5e017..f428f16940f 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2591,7 +2591,7 @@ sub setup_vardir() {
{
for (<$bindir/storage/*$opt_vs_config/*.dll>,
<$bindir/plugin/*$opt_vs_config/*.dll>,
- <$bindir/libmariadb/plugins/*$opt_vs_config/*.dll>,
+ <$bindir/libmariadb$opt_vs_config/*.dll>,
<$bindir/sql$opt_vs_config/*.dll>)
{
my $pname=basename($_);
@@ -2612,6 +2612,7 @@ sub setup_vardir() {
for (<$bindir/storage/*/*.so>,
<$bindir/plugin/*/*.so>,
<$bindir/libmariadb/plugins/*/*.so>,
+ <$bindir/libmariadb/*.so>,
<$bindir/sql/*.so>)
{
my $pname=basename($_);