1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

log.cc:

Browse Source 
Fixing failed merge
This commit is contained in:
rburnett@production.mysql.com 2006-09-12 04:46:41 +02:00
parent cf1a0b3250
commit db89fb33aa
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/log.cc
View File

@ -3969,12 +3969,15 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
*/
#ifdef EMBEDDED_LIBRARY
void vprint_msg_to_log(enum loglevel level __attribute__((unused)),
int vprint_msg_to_log(enum loglevel level __attribute__((unused)),
const char *format __attribute__((unused)),
va_list argsi __attribute__((unused)))
{}
{
DBUG_ENTER("vprint_msg_to_log");
DBUG_RETURN(0);
}
#else /*!EMBEDDED_LIBRARY*/
void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
int vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
{
char buff[1024];
uint length;