From: Bjorn Munch
Date: February 4 2011 12:57pm
Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:3023)
List-Archive: http://lists.mysql.com/commits/130407
Message-Id: <201102041257.p14Cv8K2026494@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

 3023 Bjorn Munch	2011-02-04 [merge]
      upmerge 47141

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-01-29 23:40:42 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-04 12:56:44 +0000
@@ -1886,9 +1886,12 @@ sub executable_setup () {
 sub client_debug_arg($$) {
   my ($args, $client_name)= @_;
 
+  # Workaround for Bug #50627: drop any debug opt
+  return if $client_name =~ /^mysqlbinlog/;
+
   if ( $opt_debug ) {
     mtr_add_arg($args,
-		"--debug=$debug_d:t:A,%s/log/%s.trace",
+		"--loose-debug=$debug_d:t:A,%s/log/%s.trace",
 		$path_vardir_trace, $client_name)
   }
 }

No bundle (reason: revision is a merge).