From fbc456233181ee1d3653a928d8ac212622aff42f Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Wed, 27 Feb 2008 13:30:49 +0400
Subject: [PATCH] merging

---
 libmysqld/lib_sql.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index bef51a33d75..85845eb6a0e 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -1118,10 +1118,11 @@ bool Protocol::net_store_data(const uchar *from, size_t length)
 }
 
 
-void vprint_msg_to_log(enum loglevel level __attribute__((unused)),
+int vprint_msg_to_log(enum loglevel level __attribute__((unused)),
                        const char *format, va_list argsi)
 {
   vsnprintf(mysql_server_last_error, sizeof(mysql_server_last_error),
            format, argsi);
   mysql_server_last_errno= CR_UNKNOWN_ERROR;
+  return 0;
 }