database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
This commit is contained in:
unknown
2006-08-21 14:41:50 +02:00
parent 70b7378898 153c14a47a
commit 7cbb068c4e
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmysqld/libmysqld.def
View File

@ -163,3 +163,4 @@ EXPORTS
my_charset_bin my_charset_bin
my_charset_same my_charset_same
modify_defaults_file modify_defaults_file
mysql_set_server_option

1
mysql-test/t/handler.test
View File

@ -1,3 +1,4 @@
-- source include/not_embedded.inc
# #
# test of HANDLER ... # test of HANDLER ...
# #

7
sql/log.cc
View File

@ -2385,6 +2385,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];
@ -2400,6 +2406,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, ...)