bk commit into 5.1 tree (knielsen:1.2401)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2401 06/05/17 15:01:48 knielsen@stripped +1 -0
  After-merge fixes.

  dbug/dbug.c
    1.27 06/05/17 15:01:44 knielsen@stripped +14 -8
    After-merge fixes.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/tmp-5.1

--- 1.26/dbug/dbug.c	2006-05-16 14:34:28 +02:00
+++ 1.27/dbug/dbug.c	2006-05-17 15:01:44 +02:00
@@ -256,7 +256,7 @@
         /* Push current debug settings */
 static void PushState(CODE_STATE *cs);
 	/* 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 */
 static BOOLEAN DoTrace(CODE_STATE *cs);
 
@@ -744,7 +744,7 @@
   if (discard->next != NULL)
   {
     cs->stack= discard->next;
-    FreeState(discard);
+    FreeState(cs, discard);
   }
 }
 
@@ -1432,7 +1432,8 @@
  *
  */
 static void FreeState (
-struct state *state)
+CODE_STATE *cs,
+struct settings *state)
 {
   if (!is_shared(state, keywords))
     FreeList(state->keywords);
@@ -1469,12 +1470,17 @@
  */
 void _db_end_ ()
 {
-  reg1 struct state *discard;
-  while((discard= stack) != NULL) {
-    stack= discard -> next_state;
-    FreeState (discard);
+  struct settings *discard;
+  CODE_STATE *cs=0;
+
+  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;
 }