From eb27f163a31ca6995c98ada9fc678176c041dd93 Mon Sep 17 00:00:00 2001 From: Alexander Nozdrin Date: Mon, 24 May 2010 22:57:25 +0400 Subject: [PATCH] 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. --- dbug/dbug.c | 8 +------- mysql-test/mysql-test-run.pl | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dbug/dbug.c b/dbug/dbug.c index ff7efb4ff55..0355d553cff 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -507,13 +507,7 @@ int DbugParse(CODE_STATE *cs, const char *control) 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; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 58a289422f4..68955010696 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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; }