fixes for bintar mtr failures:

look for plugins in the correct path.
skip --plugin-load if it has the empty soname part, not only if the whole argument is empty.

1 files changed, 2 insertions, 0 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ebe7af3641d..0f9006cad69 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2717,6 +2717,7 @@ sub setup_vardir() {
     # hm, what paths work for debs and for rpms ?
     for (<$bindir/lib64/mysql/plugin/*.so>,
          <$bindir/lib/mysql/plugin/*.so>,
+         <$bindir/lib/plugin/*.so>,             # bintar
          <$bindir/lib/plugin/*.dll>)
     {
       my $pname=basename($_);
@@ -5292,6 +5293,7 @@ sub mysqld_arguments ($$$) {
     }
     elsif ($plugin = mtr_match_prefix($arg,  "--plugin-load="))
     {
+      next if $plugin =~ /=$/;
       push @plugins, $plugin unless $seen{$plugin};
       $seen{$plugin} = 1;
     }