From: Bjorn Munch
Date: January 12 2011 3:14pm
Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:3006)
List-Archive: http://lists.mysql.com/commits/128525
Message-Id: <201101121514.p0CFE4F2023129@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/bm136801/my/mtr-tr/ based on revid:bjorn.munch@stripped

 3006 Bjorn Munch	2011-01-12 [merge]
      upmerge with follow-up to 58841

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-01-12 10:22:11 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-01-12 15:13:48 +0000
@@ -2053,10 +2053,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

No bundle (reason: revision is a merge).