Commit 5e1a4fdb authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/mysql-4.1.13717 

into  mysql.com:/home/hf/work/mysql-5.0-mrg


sql/log.cc:
  Auto merged
parents 22f6e651 2b86ee9f

sql/log.cc

+7 −0
Original line number Diff line number Diff line
@@ -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, ...)