bzr commit into mysql-trunk branch (alik:3025) Bug#53925

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/00.builds/mysql-trunk-merge/ based on revid:alexey.kopytov@stripped

 3025 Alexander Nozdrin	2010-05-24
      Fix for Bug#53925 (valgrind failures in rpl.rpl_get_master_version_and_clock
      in mysql-trunk-merge).
      
      There were two problems:
        - a mistake during merge of a patch for Bug 52629 from 5.1;
        - MTR treated auxilary output of newer valgrind as an error.
      
      The fixes are:
        - Fix merge error;
        - Teach MTR to skip 'HEAP summary' section of valgrind output.

    modified:
      dbug/dbug.c
      mysql-test/mysql-test-run.pl
=== modified file 'dbug/dbug.c'
--- a/dbug/dbug.c	2010-05-23 20:41:18 +0000
+++ b/dbug/dbug.c	2010-05-24 16:18:15 +0000
@@ -507,13 +507,7 @@ int DbugParse(CODE_STATE *cs, const char
   rel= control[0] == '+' || control[0] == '-';
   if ((!rel || (!stack->out_file && !stack->next)))
   {
-    /*
-      We need to free what's already in init_settings, because unlike
-      the thread related stack frames there's a chance that something
-      is in these variables already.
-    */
-    if (stack == &init_settings)
-      FreeState(cs, stack, 0);
+    FreeState(cs, stack, 0);
     stack->flags= 0;
     stack->delay= 0;
     stack->maxdepth= 0;
@@ -1715,7 +1709,10 @@ void _db_end_()
   while ((discard= cs->stack))
   {
     if (discard == &init_settings)
+    {
+      FreeState (cs, discard, 0);
       break;
+    }
     cs->stack= discard->next;
     FreeState(cs, discard, 1);
   }

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-03-15 13:57:20 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-05-24 16:18:15 +0000
@@ -3811,6 +3811,7 @@ sub extract_warning_lines ($$) {
       # Skip valgrind summary from tests where server has been restarted
       # Should this contain memory leaks, the final report will find it
       $skip_valgrind= 1 if $line =~ /^==\d+== ERROR SUMMARY:/;
+      $skip_valgrind= 1 if $line =~ /^==\d+== HEAP SUMMARY:/;
       $skip_valgrind= 0 unless $line =~ /^==\d+==/;
       next if $skip_valgrind;
     }


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