Commit 18389386 authored by Sergei Golubchik's avatar Sergei Golubchik

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.
parent 38c4ef63
...@@ -2717,6 +2717,7 @@ sub setup_vardir() { ...@@ -2717,6 +2717,7 @@ sub setup_vardir() {
# hm, what paths work for debs and for rpms ? # hm, what paths work for debs and for rpms ?
for (<$bindir/lib64/mysql/plugin/*.so>, for (<$bindir/lib64/mysql/plugin/*.so>,
<$bindir/lib/mysql/plugin/*.so>, <$bindir/lib/mysql/plugin/*.so>,
<$bindir/lib/plugin/*.so>, # bintar
<$bindir/lib/plugin/*.dll>) <$bindir/lib/plugin/*.dll>)
{ {
my $pname=basename($_); my $pname=basename($_);
...@@ -5292,6 +5293,7 @@ sub mysqld_arguments ($$$) { ...@@ -5292,6 +5293,7 @@ sub mysqld_arguments ($$$) {
} }
elsif ($plugin = mtr_match_prefix($arg, "--plugin-load=")) elsif ($plugin = mtr_match_prefix($arg, "--plugin-load="))
{ {
next if $plugin =~ /=$/;
push @plugins, $plugin unless $seen{$plugin}; push @plugins, $plugin unless $seen{$plugin};
$seen{$plugin} = 1; $seen{$plugin} = 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment