From db89fb33aa26ed68d2e17b732fe2d0e208798bdc Mon Sep 17 00:00:00 2001
From: "rburnett@production.mysql.com" <>
Date: Tue, 12 Sep 2006 04:46:41 +0200
Subject: [PATCH] log.cc:   Fixing failed merge

---
 sql/log.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sql/log.cc b/sql/log.cc
index 9ffa1653909..8a8262c174d 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -3969,12 +3969,15 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
 */
 
 #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;