bk commit into 5.1 tree (cmiller:1.2316)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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-05 11:01:50-04:00, cmiller@stripped +1 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
  MERGE: 1.1810.2030.2

  sql/log.cc@stripped, 2006-09-05 11:01:48-04:00, cmiller@stripped +1 -1
    Manual merge.
    MERGE: 1.158.1.34

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-maint/RESYNC

--- 1.223/sql/log.cc	2006-09-05 11:01:54 -04:00
+++ 1.224/sql/log.cc	2006-09-05 11:01:54 -04:00
@@ -3963,6 +3963,12 @@
     return an error (e.g. logging to the log tables)
 */
 
+#ifdef EMBEDDED_LIBRARY
+int vprint_msg_to_log(enum loglevel level __attribute__((unused)),
+                       const char *format __attribute__((unused)),
+                       va_list argsi __attribute__((unused)))
+{}
+#else /*!EMBEDDED_LIBRARY*/
 int vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
 {
   char   buff[1024];
@@ -3979,6 +3985,7 @@
 
   DBUG_RETURN(0);
 }
+#endif /*EMBEDDED_LIBRARY*/
 
 
 void sql_print_error(const char *format, ...)