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

Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2

Browse Source 
into  production.mysql.com:/usersnfs/rburnett/mysql-5.1


libmysqld/libmysqld.def:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2006-09-06 18:27:26 +02:00
parent bc3122a9f8 3f4964394c
commit 452a885e1f
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmysqld/libmysqld.def
View File

@@ -164,3 +164,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 ...
# #

9
sql/log.cc
View File

@@ -3968,7 +3968,13 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
return an error (e.g. logging to the log tables) return an error (e.g. logging to the log tables)
*/ */
int vprint_msg_to_log(enum loglevel level, const char *format, va_list args) #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]; char buff[1024];
uint length; uint length;
@@ -3984,6 +3990,7 @@ int vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
#endif /*EMBEDDED_LIBRARY*/
void sql_print_error(const char *format, ...) void sql_print_error(const char *format, ...)