bzr commit into mysql-5.1-mtr branch (bjorn.munch:2978) Bug#47141

[Bjorn Munch]

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

 2978 Bjorn Munch	2011-02-04
      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

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-01-27 11:38:13 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-04 11:33:45 +0000
@@ -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)
   }
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]