summaryrefslogtreecommitdiff
path: root/dbug
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2010-05-20 10:31:03 +0400
committerSergey Glukhov <Sergey.Glukhov@sun.com>2010-05-20 10:31:03 +0400
commit7132ccd7caa5e96f97eb0b8a9242cc11693ab1c8 (patch)
treece44a766fa95b6a55e2402bea5582f6a66e1f16a /dbug
parentce3194c1c889eaa17d16b0badcbdf9c03d16ebd6 (diff)
downloadmariadb-git-7132ccd7caa5e96f97eb0b8a9242cc11693ab1c8.tar.gz
Bug#52884 mysql-test-run does not work with --debug option
Server crashes on 64bit linux with 'double free or corruption' message, on 32bit mysql-test-run silently fails on bootstrap stage. The problem is that FreeState() is called twice for init_settings struct in _db_end_ function. The fix is to remove superfluous FreeState() call. Additional fix: fixed discrepancy of result file when debug & valgrind options are enabled for MTR.
Diffstat (limited to 'dbug')
-rw-r--r--dbug/dbug.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c
index 30ad6c2c6d1..8fa5ed9af6b 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -1517,10 +1517,7 @@ void _db_end_()
while ((discard= cs->stack))
{
if (discard == &init_settings)
- {
- FreeState (cs, discard, 0);
break;
- }
cs->stack= discard->next;
FreeState(cs, discard, 1);
}