From 1838938671197b0ae40bed0a99ea62dbf4be2595 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 6 Jun 2012 16:41:13 +0200 Subject: 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. --- mysql-test/mysql-test-run.pl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mysql-test/mysql-test-run.pl') 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; } -- cgit v1.2.1