bk commit into 5.1 tree (rburnett:1.2312)

[reggie]

Below is the list of changes that have just been committed into a local
5.1 repository of rburnett. When rburnett 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-09-12 04:46:41+02:00, rburnett@stripped +1 -0
  log.cc:
    Fixing failed merge

  sql/log.cc@stripped, 2006-09-12 04:46:28+02:00, rburnett@stripped +6 -3
    Fixing failed merge

# 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:	rburnett
# Host:	production.mysql.com
# Root:	/usersnfs/rburnett/mysql-5.1-kt

--- 1.226/sql/log.cc	2006-09-12 04:46:48 +02:00
+++ 1.227/sql/log.cc	2006-09-12 04:46:48 +02:00
@@ -3969,12 +3969,15 @@
 */
 
 #ifdef EMBEDDED_LIBRARY
-void vprint_msg_to_log(enum loglevel level __attribute__((unused)),
+int vprint_msg_to_log(enum loglevel level __attribute__((unused)),
                        const char *format __attribute__((unused)),
                        va_list argsi __attribute__((unused)))
-{}
+{
+  DBUG_ENTER("vprint_msg_to_log");
+  DBUG_RETURN(0);
+}
 #else /*!EMBEDDED_LIBRARY*/
-void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
+int vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
 {
   char   buff[1024];
   uint length;