Commit 52b5421e authored by holyfoot/hf@mysql.com/vva.(none)'s avatar holyfoot/hf@mysql.com/vva.(none)

Merge hf@192.168.21.12:work/mysql-4.1.13717

into  mysql.com:/home/hf/work/mysql-4.1.clean
parents 907f5db8 21f721c6
...@@ -2321,6 +2321,12 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff, ...@@ -2321,6 +2321,12 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
void void
*/ */
#ifdef EMBEDDED_LIBRARY
void vprint_msg_to_log(enum loglevel level __attribute__((unused)),
const char *format __attribute__((unused)),
va_list argsi __attribute__((unused)))
{}
#else /*!EMBEDDED_LIBRARY*/
void vprint_msg_to_log(enum loglevel level, const char *format, va_list args) void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
{ {
char buff[1024]; char buff[1024];
...@@ -2336,6 +2342,7 @@ void vprint_msg_to_log(enum loglevel level, const char *format, va_list args) ...@@ -2336,6 +2342,7 @@ void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
#endif /*EMBEDDED_LIBRARY*/
void sql_print_error(const char *format, ...) void sql_print_error(const char *format, ...)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment