From 15c63309d4da505d171a0856a0404ee20bbd6484 Mon Sep 17 00:00:00 2001
From: He Zhenxing <zhenxing.he@sun.com>
Date: Fri, 2 Oct 2009 12:11:50 +0800
Subject: [PATCH] Post fix backporting wl#1720

Fix mtr semisync plugin option paths
---
 mysql-test/mysql-test-run.pl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 434896df6a5..d50195c7d16 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1819,9 +1819,13 @@ sub environment_setup {
   # Add the path where mysqld will find semisync plugins
   # --------------------------------------------------------------------------
   my $lib_semisync_master_plugin=
-      mtr_file_exists("$basedir/plugin/semisync/.libs/libsemisync_master.so");
+      mtr_file_exists(vs_config_dirs('plugin/semisync',"libsemisync_master.so"),
+		      "$basedir/plugin/semisync/.libs/libsemisync_master.so",
+                      "$basedir/lib/mysql/plugin/libsemisync_master.so");
   my $lib_semisync_slave_plugin=
-      mtr_file_exists("$basedir/plugin/semisync/.libs/libsemisync_slave.so");
+      mtr_file_exists(vs_config_dirs('plugin/semisync',"libsemisync_slave.so"),
+		      "$basedir/plugin/semisync/.libs/libsemisync_slave.so",
+                      "$basedir/lib/mysql/plugin/libsemisync_slave.so");
   if ($lib_semisync_master_plugin && $lib_semisync_slave_plugin)
   {
     $ENV{'SEMISYNC_MASTER_PLUGIN'}= basename($lib_semisync_master_plugin);