summaryrefslogtreecommitdiff
path: root/mysql-test/t/variables_debug.test
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
commitb8af4ab216ea6efd433ebdd2da4911978bd22d88 (patch)
treece44a766fa95b6a55e2402bea5582f6a66e1f16a /mysql-test/t/variables_debug.test
parent7e889a8dc9599fad3987c145cc19ea7f5528f8a6 (diff)
downloadmariadb-git-b8af4ab216ea6efd433ebdd2da4911978bd22d88.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. 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.
Diffstat (limited to 'mysql-test/t/variables_debug.test')
-rw-r--r--mysql-test/t/variables_debug.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/variables_debug.test b/mysql-test/t/variables_debug.test
index 8f2bde7ae42..12f5d2e6ca5 100644
--- a/mysql-test/t/variables_debug.test
+++ b/mysql-test/t/variables_debug.test
@@ -1,5 +1,7 @@
--source include/have_debug.inc
+SET @old_debug = @@GLOBAL.debug;
+
#
# Bug#34678 @@debug variable's incremental mode
#
@@ -21,5 +23,6 @@ SELECT @@global.debug;
SET GLOBAL debug='';
SELECT @@global.debug;
+SET GLOBAL debug=@old_debug;
--echo End of 5.1 tests