diff options
author | holyfoot/hf@mysql.com/hfmain.(none) <> | 2008-02-27 13:30:49 +0400 |
---|---|---|
committer | holyfoot/hf@mysql.com/hfmain.(none) <> | 2008-02-27 13:30:49 +0400 |
commit | fbc456233181ee1d3653a928d8ac212622aff42f (patch) | |
tree | 71eab47d2b1c7a2f001c1fb778c171b9df999d15 /libmysqld/lib_sql.cc | |
parent | b727a22d97663663d61062b4ec73c72d818d86e8 (diff) | |
download | mariadb-git-fbc456233181ee1d3653a928d8ac212622aff42f.tar.gz |
merging
Diffstat (limited to 'libmysqld/lib_sql.cc')
-rw-r--r-- | libmysqld/lib_sql.cc | 3 |
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; } |