From add4385d8d4014992ce35695b40004a88c507109 Mon Sep 17 00:00:00 2001
From: Bjorn Munch <bjorn.munch@oracle.com>
Date: Wed, 12 Jan 2011 14:17:54 +0100
Subject: [PATCH] Bug #58841 Generalise handling of plugins in MTR
 mysql-test-run.pl script Follow-up fix: mtr died if trying to run semisync
 test w/o the plugin

---
 mysql-test/mysql-test-run.pl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 83f6a83682d..b786066faf6 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2051,10 +2051,7 @@ sub environment_setup {
   read_plugin_defs("include/plugin.defs");
 
   # Simplify reference to semisync plugins
-  if ($ENV{'SEMISYNC_MASTER_PLUGIN'})
-  {
-    $ENV{'SEMISYNC_PLUGIN_OPT'}= $ENV{'SEMISYNC_MASTER_PLUGIN_OPT'};
-  }
+  $ENV{'SEMISYNC_PLUGIN_OPT'}= $ENV{'SEMISYNC_MASTER_PLUGIN_OPT'};
 
   # --------------------------------------------------------------------------
   # Valgrind need to be run with debug libraries otherwise it's almost