Commit f80ba7a1 authored by rburnett@bk-internal.mysql.com's avatar rburnett@bk-internal.mysql.com

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
parents 7a55f7fa b81b1025
......@@ -163,3 +163,4 @@ EXPORTS
my_charset_bin
my_charset_same
modify_defaults_file
mysql_set_server_option
-- source include/not_embedded.inc
#
# test of HANDLER ...
#
......
......@@ -2385,6 +2385,12 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
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)
{
char buff[1024];
......@@ -2400,6 +2406,7 @@ void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
DBUG_VOID_RETURN;
}
#endif /*EMBEDDED_LIBRARY*/
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