summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <holyfoot/hf@mysql.com/hfmain.(none)>2008-02-27 13:30:49 +0400
committerunknown <holyfoot/hf@mysql.com/hfmain.(none)>2008-02-27 13:30:49 +0400
commit4a8c442f040db67763697df8f109f79ec6240979 (patch)
tree71eab47d2b1c7a2f001c1fb778c171b9df999d15 /libmysqld
parent33c4301922112658131e094b3b6b5912c236e90d (diff)
downloadmariadb-git-4a8c442f040db67763697df8f109f79ec6240979.tar.gz
merging
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc3
1 files changed, 2 insertions, 1 deletions
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;
}