From 3287379eb11bc70098d4099e303f2cef507ea4ac Mon Sep 17 00:00:00 2001
From: Bjorn Munch <bjorn.munch@oracle.com>
Date: Fri, 4 Feb 2011 12:33:45 +0100
Subject: [PATCH] Bug #47141 "mysqltest" breaks because it tries to act on a
 debug option which is disabled Replace --debug with --loose-debug to prevent
 failure exit Update: added workaround for 50627, skip all debugging of
 mysqlbinlog

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

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 03dd3e5bd3f..27e52d814e4 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1783,9 +1783,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=d:t:A,%s/log/%s.trace",
+		"--loose-debug=d:t:A,%s/log/%s.trace",
 		$path_vardir_trace, $client_name)
   }
 }