diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-05-24 22:57:25 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-05-24 22:57:25 +0400 |
| commit | f54464035a4bfae7c7297e7fe1a8ba7e76ea6585 (patch) | |
| tree | 1766478c350fff76d2c14d0784c5a87653928579 /dbug | |
| parent | 71929d76d06bb1f3df48fc8d8cd34f50feba4442 (diff) | |
| download | mariadb-git-f54464035a4bfae7c7297e7fe1a8ba7e76ea6585.tar.gz | |
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.
Diffstat (limited to 'dbug')
| -rw-r--r-- | dbug/dbug.c | 8 |
1 files changed, 1 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; |