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.

dbug/dbug.c:
  The problem is that FreeState() is called twice
  for init_settings struct in _db_end_ function.
  The fix is to remove superfluous FreeState() call.
mysql-test/r/variables_debug.result:
  fixed discrepancy of result file when
  debug & valgrind options are enabled
  for MTR.
mysql-test/t/variables_debug.test:
  fixed discrepancy of result file when
  debug & valgrind options are enabled
  for MTR.
sql/set_var.cc:
  fixed discrepancy of result file when
  debug & valgrind options are enabled
  for MTR.

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);
   }