Commit 9e89ea6f authored by unknown's avatar unknown
Browse files

log.cc: 

  Fixing failed merge


sql/log.cc:
  Fixing failed merge
parent 567561ed

sql/log.cc

+6 −3
Original line number Diff line number Diff line
@@ -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;