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

After-merge fixes.

Browse Source
This commit is contained in:
unknown 2006-05-17 15:01:48 +02:00
parent 771d3d8229
commit 316f967d00
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dbug/dbug.c
View File

@ -256,7 +256,7 @@ static void DBUGCloseFile(CODE_STATE *cs, FILE *fp);
/* Push current debug settings */ /* Push current debug settings */
static void PushState(CODE_STATE *cs); static void PushState(CODE_STATE *cs);
/* Free memory associated with debug state. */ /* Free memory associated with debug state. */
static void FreeState (struct state *state); static void FreeState (CODE_STATE *cs, struct settings *state);
/* Test for tracing enabled */ /* Test for tracing enabled */
static BOOLEAN DoTrace(CODE_STATE *cs); static BOOLEAN DoTrace(CODE_STATE *cs);
@ -744,7 +744,7 @@ void _db_pop_()
if (discard->next != NULL) if (discard->next != NULL)
{ {
cs->stack= discard->next; cs->stack= discard->next;
FreeState(discard); FreeState(cs, discard);
} }
} }
@ -1432,7 +1432,8 @@ static void PushState(CODE_STATE *cs)
* *
*/ */
static void FreeState ( static void FreeState (
struct state *state) CODE_STATE *cs,
struct settings *state)
{ {
if (!is_shared(state, keywords)) if (!is_shared(state, keywords))
FreeList(state->keywords); FreeList(state->keywords);
@ -1469,12 +1470,17 @@ struct state *state)
*/ */
void _db_end_ () void _db_end_ ()
{ {
reg1 struct state *discard; struct settings *discard;
while((discard= stack) != NULL) { CODE_STATE *cs=0;
stack= discard -> next_state;
FreeState (discard); get_code_state_or_return;
while((discard= cs->stack) != NULL) {
if(discard == &init_settings)
break;
cs->stack= discard->next;
FreeState (cs, discard);
} }
_db_on_=0;
} }