1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#52884 mysql-test-run does not work with --debug option

Browse Source 
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.
This commit is contained in:
Sergey Glukhov 2010-05-20 10:31:03 +04:00
parent 7e889a8dc9
commit b8af4ab216
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbug/dbug.c
View File

@ -1517,10 +1517,7 @@ void _db_end_()
while ((discard= cs->stack)) while ((discard= cs->stack))
{ {
if (discard == &init_settings) if (discard == &init_settings)
{
FreeState (cs, discard, 0);
break; break;
}
cs->stack= discard->next; cs->stack= discard->next;
FreeState(cs, discard, 1); FreeState(cs, discard, 1);
} }

2
mysql-test/r/variables_debug.result
View File

@ -1,3 +1,4 @@
SET @old_debug = @@GLOBAL.debug;
set debug= 'T'; set debug= 'T';
select @@debug; select @@debug;
@@debug @@debug
@ -22,4 +23,5 @@ SET GLOBAL debug='';
SELECT @@global.debug; SELECT @@global.debug;
@@global.debug @@global.debug
SET GLOBAL debug=@old_debug;
End of 5.1 tests End of 5.1 tests

3
mysql-test/t/variables_debug.test
View File

@ -1,5 +1,7 @@
--source include/have_debug.inc --source include/have_debug.inc
SET @old_debug = @@GLOBAL.debug;
# #
# Bug#34678 @@debug variable's incremental mode # Bug#34678 @@debug variable's incremental mode
# #
@ -21,5 +23,6 @@ SELECT @@global.debug;
SET GLOBAL debug=''; SET GLOBAL debug='';
SELECT @@global.debug; SELECT @@global.debug;
SET GLOBAL debug=@old_debug;
--echo End of 5.1 tests --echo End of 5.1 tests

9
sql/set_var.cc
View File

@ -4239,10 +4239,15 @@ bool sys_var_thd_dbug::check(THD *thd, set_var *var)
bool sys_var_thd_dbug::update(THD *thd, set_var *var) bool sys_var_thd_dbug::update(THD *thd, set_var *var)
{ {
char buf[256];
String str(buf, sizeof(buf), system_charset_info), *res;
res= var->value->val_str(&str);
if (var->type == OPT_GLOBAL) if (var->type == OPT_GLOBAL)
DBUG_SET_INITIAL(var ? var->value->str_value.c_ptr() : ""); DBUG_SET_INITIAL(res ? res->c_ptr() : "");
else else
DBUG_SET(var ? var->value->str_value.c_ptr() : ""); DBUG_SET(res ? res->c_ptr() : "");
return 0; return 0;
} }