summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-05-19 12:44:15 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2018-05-19 12:44:15 +0000
commit4a9acaa5245b4cf7825a635e820e3459b8a5f745 (patch)
tree7c4dc44818fec0495ddb2b35960b7043cfc373d6
parentae77a0986d42f846a4bd953908a2b9852c492b4b (diff)
downloadmariadb-git-4a9acaa5245b4cf7825a635e820e3459b8a5f745.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 6740218ca0a..3bcbbc44b69 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2576,7 +2576,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($_);
@@ -2597,6 +2597,7 @@ sub setup_vardir() {
for (<$bindir/storage/*/*.so>,
<$bindir/plugin/*/*.so>,
<$bindir/libmariadb/plugins/*/*.so>,
+ <$bindir/libmariadb/*.so>,
<$bindir/sql/*.so>)
{
my $pname=basename($_);