bk commit into 5.1 tree (rburnett:1.2310)

[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-07 04:48:29+02:00, rburnett@stripped +2 -0
  Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
  into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
  MERGE: 1.2308.1.1

  sql/log.cc@stripped, 2006-09-07 04:48:24+02:00, rburnett@stripped +0 -0
    Auto merged
    MERGE: 1.223.1.3

  sql/mysqld.cc@stripped, 2006-09-07 04:48:24+02:00, rburnett@stripped +0 -0
    Auto merged
    MERGE: 1.580.1.2

# 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:	bk-internal.mysql.com
# Root:	/data0/bk/mysql-5.1-kt/RESYNC

--- 1.225/sql/log.cc	2006-09-07 04:48:35 +02:00
+++ 1.226/sql/log.cc	2006-09-07 04:48:35 +02:00
@@ -3968,7 +3968,13 @@
     return an error (e.g. logging to the log tables)
 */
 
-int vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
+#ifdef EMBEDDED_LIBRARY
+void vprint_msg_to_log(enum loglevel level __attribute__((unused)),
+                       const char *format __attribute__((unused)),
+                       va_list argsi __attribute__((unused)))
+{}
+#else /*!EMBEDDED_LIBRARY*/
+void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
 {
   char   buff[1024];
   uint length;
@@ -3984,6 +3990,7 @@
 
   DBUG_RETURN(0);
 }
+#endif /*EMBEDDED_LIBRARY*/
 
 
 void sql_print_error(const char *format, ...)