bk commit into 5.1 tree (msvensson:1.2218)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2218 06/03/06 12:16:25 msvensson@neptunus.(none) +1 -0
  Add DBUG_ functions to "slave_print_msg" 

  sql/slave.cc
    1.266 06/03/06 12:16:17 msvensson@neptunus.(none) +4 -1
    Add DBUG_ functions to "slave_print_msg" 

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/my51-bug17728

--- 1.265/sql/slave.cc	2006-02-17 08:13:21 +01:00
+++ 1.266/sql/slave.cc	2006-03-06 12:16:17 +01:00
@@ -917,6 +917,8 @@
   char buff[MAX_SLAVE_ERRMSG], *pbuff= buff;
   uint pbuffsize= sizeof(buff);
   va_list args;
+  DBUG_ENTER("slave_print_msg");
+
   va_start(args,msg);
   switch (level)
   {
@@ -943,7 +945,7 @@
     break;
   default:
     DBUG_ASSERT(0); // should not come here
-    return; // don't crash production builds, just do nothing
+    DBUG_VOID_RETURN; // don't crash production builds, just do nothing
   }
   my_vsnprintf(pbuff, pbuffsize, msg, args);
   /* If the msg string ends with '.', do not add a ',' it would be ugly */
@@ -951,6 +953,7 @@
     (*report_function)("Slave: %s Error_code: %d", pbuff, err_code);
   else
     (*report_function)("Slave: %s, Error_code: %d", pbuff, err_code);
+  DBUG_VOID_RETURN;
 }
 
 /*