Commit ed173405 authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/log.cc:
  Manual merge.
parents 6a94bc51 5e1a4fdb

sql/log.cc

+7 −0
Original line number Diff line number Diff line
@@ -3963,6 +3963,12 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff, 
    return an error (e.g. logging to the log tables)

*/



#ifdef EMBEDDED_LIBRARY

int vprint_msg_to_log(enum loglevel level __attribute__((unused)),

                       const char *format __attribute__((unused)),

                       va_list argsi __attribute__((unused)))

{}

#else /*!EMBEDDED_LIBRARY*/

int vprint_msg_to_log(enum loglevel level, const char *format, va_list args)

{

  char   buff[1024];
@@ -3979,6 +3985,7 @@ int vprint_msg_to_log(enum loglevel level, const char *format, va_list args) 


  DBUG_RETURN(0);

}

#endif /*EMBEDDED_LIBRARY*/





void sql_print_error(const char *format, ...)