summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHe Zhenxing <zhenxing.he@sun.com>2009-12-04 09:43:39 +0800
committerHe Zhenxing <zhenxing.he@sun.com>2009-12-04 09:43:39 +0800
commit4ea0296e43cb712cf8913962bfc370bc1520141d (patch)
tree015b5a1b2d0965e596d498c5013bbe685bd998b2
parent75b9db91ded7a399f13bb4188b53975c7fd4697b (diff)
downloadmariadb-git-4ea0296e43cb712cf8913962bfc370bc1520141d.tar.gz
Bug#49170 Inconsistent placement of semisync plugin prevents it from getting tested
Add $basedir/lib/plugin to the search paths for semisync plugins.
-rwxr-xr-xmysql-test/mysql-test-run.pl6
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ddee67c124e..e88548595ef 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1834,11 +1834,13 @@ sub environment_setup {
my $lib_semisync_master_plugin=
mtr_file_exists(vs_config_dirs('plugin/semisync',$semisync_master_filename),
"$basedir/plugin/semisync/.libs/" . $semisync_master_filename,
- "$basedir/lib/mysql/plugin/" . $semisync_master_filename);
+ "$basedir/lib/mysql/plugin/" . $semisync_master_filename,
+ "$basedir/lib/plugin/" . $semisync_master_filename);
my $lib_semisync_slave_plugin=
mtr_file_exists(vs_config_dirs('plugin/semisync',$semisync_slave_filename),
"$basedir/plugin/semisync/.libs/" . $semisync_slave_filename,
- "$basedir/lib/mysql/plugin/" . $semisync_slave_filename);
+ "$basedir/lib/mysql/plugin/" . $semisync_slave_filename,
+ "$basedir/lib/plugin/" . $semisync_slave_filename);
if ($lib_semisync_master_plugin && $lib_semisync_slave_plugin)
{
$ENV{'SEMISYNC_MASTER_PLUGIN'}= basename($lib_semisync_master_plugin);