database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix for Bug#53925 (valgrind failures in rpl.rpl_get_master_version_and_clock

Browse Source 
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.
This commit is contained in:
Alexander Nozdrin
2010-05-24 22:57:25 +04:00
parent 7ce0262ba7
commit eb27f163a3
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbug/dbug.c
View File

@ -507,13 +507,7 @@ int DbugParse(CODE_STATE *cs, const char *control)
rel= control[0] == '+' || control[0] == '-'; rel= control[0] == '+' || control[0] == '-';
if ((!rel || (!stack->out_file && !stack->next))) if ((!rel || (!stack->out_file && !stack->next)))
{ {
/* FreeState(cs, stack, 0);
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);
stack->flags= 0; stack->flags= 0;
stack->delay= 0; stack->delay= 0;
stack->maxdepth= 0; stack->maxdepth= 0;

1
mysql-test/mysql-test-run.pl
View File

@ -3811,6 +3811,7 @@ sub extract_warning_lines ($$) {
# Skip valgrind summary from tests where server has been restarted # Skip valgrind summary from tests where server has been restarted
# Should this contain memory leaks, the final report will find it # 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+== ERROR SUMMARY:/;
$skip_valgrind= 1 if $line =~ /^==\d+== HEAP SUMMARY:/;
$skip_valgrind= 0 unless $line =~ /^==\d+==/; $skip_valgrind= 0 unless $line =~ /^==\d+==/;
next if $skip_valgrind; next if $skip_valgrind;
} }