bk commit into 5.1 tree (kostja:1.2275)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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@stripped, 2006-08-14 16:13:24+04:00, kostja@stripped +1 -0
  Windows build fix: declare _db_set_ before it's used.

  dbug/dbug.c@stripped, 2006-08-14 16:13:20+04:00, kostja@stripped +50 -51
    Windows build fix: declare _db_set_ before it's used.

# 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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-runtime-merge

--- 1.29/dbug/dbug.c	2006-08-14 16:13:33 +04:00
+++ 1.30/dbug/dbug.c	2006-08-14 16:13:33 +04:00
@@ -412,57 +412,6 @@ void _db_process_(const char *name)
   cs->process= name;
 }
 
-
-/*
- *  FUNCTION
- *
- *      _db_push_       push current debugger settings and set up new one
- *
- *  SYNOPSIS
- *
- *      VOID _db_push_(control)
- *      char *control;
- *
- *  DESCRIPTION
- *
- *      Given pointer to a debug control string in "control", pushes
- *      the current debug settings, parses the control string, and sets
- *      up a new debug settings with _db_set_()
- *
- */
-
-void _db_push_(const char *control)
-{
-  CODE_STATE *cs=0;
-  get_code_state_or_return;
-  PushState(cs);
-  _db_set_(cs, control);
-
-}
-
-/*
- *  FUNCTION
- *
- *      _db_set_init_       set initial debugger settings
- *
- *  SYNOPSIS
- *
- *      VOID _db_set_init_(control)
- *      char *control;
- *
- *  DESCRIPTION
- *      see _db_set_
- *
- */
-
-void _db_set_init_(const char *control)
-{
-  CODE_STATE cs;
-  bzero((char*) &cs,sizeof(cs));
-  cs.stack=&init_settings;
-  _db_set_(&cs, control);
-}
-
 /*
  *  FUNCTION
  *
@@ -717,6 +666,56 @@ void _db_set_(CODE_STATE *cs, const char
     control=end+1;
     end= DbugStrTok(control);
   }
+}
+
+
+/*
+ *  FUNCTION
+ *
+ *      _db_push_       push current debugger settings and set up new one
+ *
+ *  SYNOPSIS
+ *
+ *      VOID _db_push_(control)
+ *      char *control;
+ *
+ *  DESCRIPTION
+ *
+ *      Given pointer to a debug control string in "control", pushes
+ *      the current debug settings, parses the control string, and sets
+ *      up a new debug settings with _db_set_()
+ *
+ */
+
+void _db_push_(const char *control)
+{
+  CODE_STATE *cs=0;
+  get_code_state_or_return;
+  PushState(cs);
+  _db_set_(cs, control);
+}
+
+/*
+ *  FUNCTION
+ *
+ *      _db_set_init_       set initial debugger settings
+ *
+ *  SYNOPSIS
+ *
+ *      VOID _db_set_init_(control)
+ *      char *control;
+ *
+ *  DESCRIPTION
+ *      see _db_set_
+ *
+ */
+
+void _db_set_init_(const char *control)
+{
+  CODE_STATE cs;
+  bzero((char*) &cs,sizeof(cs));
+  cs.stack=&init_settings;
+  _db_set_(&cs, control);
 }
 
 /*