- rel 2; patches updated

[packages/mysql.git] / subunit.patch

diff --git a/subunit.patch b/subunit.patch
index 8d03b18588e8499a1456662b06a094653bf04df0..8dc034cdc60f6a18f07f76f19c0cc4d7e96f65d2 100644 (file)
--- a/subunit.patch
+++ b/subunit.patch
@@ -88,7 +88,7 @@
 +      my ($time) = @_;
 +      my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime($time);
 +        open(SUBUNITOUT, ">>$SUBUNIT_OUT");
-+      printf SUBUNITOUT "time: %04d-%02d-%02d %02d:%02d:%02dZ\n", $year+1900, $mon, $mday, $hour, $min, $sec;
++      printf SUBUNITOUT "time: %04d-%02d-%02d %02d:%02d:%02dZ\n", $year+1900, ($mon+1), $mday, $hour, $min, $sec;
 +        close(SUBUNITOUT);
 +        return;
 +}
@@ -189,7 +189,15 @@
  
  require "lib/mtr_process.pl";
  require "lib/mtr_io.pl";
-@@ -629,6 +630,7 @@
+@@ -292,6 +293,7 @@
+ my $opt_valgrind_path;
+ my $valgrind_reports= 0;
+ my $opt_callgrind;
++my $opt_helgrind;
+ my %mysqld_logs;
+ my $opt_debug_sync_timeout= 300; # Default timeout for WAIT_FOR actions.
+ 
+@@ -631,6 +633,7 @@
  
          # Report test status
          mtr_report_test($result);
@@ -197,3 +205,42 @@
  
          if ( $result->is_failed() ) {
  
+@@ -1144,6 +1147,7 @@
+              'valgrind-option=s'        => \@valgrind_args,
+              'valgrind-path=s'          => \$opt_valgrind_path,
+            'callgrind'                => \$opt_callgrind,
++             'helgrind'                 => \$opt_helgrind,
+            'debug-sync-timeout=i'     => \$opt_debug_sync_timeout,
+ 
+            # Directories
+@@ -1705,11 +1709,18 @@
+       unless @valgrind_args;
+   }
+ 
++  if ( $opt_helgrind )
++  {
++    mtr_report("Turning on valgrind with helgrind for mysqld(s)");
++    $opt_valgrind= 1;
++    $opt_valgrind_mysqld= 1;
++  }
++
+   if ( $opt_valgrind )
+   {
+     # Set valgrind_options to default unless already defined
+     push(@valgrind_args, @default_valgrind_args)
+-      unless @valgrind_args;
++      unless @valgrind_args || $opt_helgrind;
+ 
+     # Don't add --quiet; you will loose the summary reports.
+ 
+@@ -5831,6 +5842,10 @@
+     mtr_add_arg($args, "--tool=callgrind");
+     mtr_add_arg($args, "--base=$opt_vardir/log");
+   }
++  elsif ( $opt_helgrind )
++  {
++    mtr_add_arg($args, "--tool=helgrind");
++  }
+   else
+   {
+     mtr_add_arg($args, "--tool=memcheck"); # From >= 2.1.2 needs this option