log.cc:
Fixing failed merge
This commit is contained in:
parent
cf1a0b3250
commit
db89fb33aa
@ -3969,12 +3969,15 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef EMBEDDED_LIBRARY
|
#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)),
|
const char *format __attribute__((unused)),
|
||||||
va_list argsi __attribute__((unused)))
|
va_list argsi __attribute__((unused)))
|
||||||
{}
|
{
|
||||||
|
DBUG_ENTER("vprint_msg_to_log");
|
||||||
|
DBUG_RETURN(0);
|
||||||
|
}
|
||||||
#else /*!EMBEDDED_LIBRARY*/
|
#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];
|
char buff[1024];
|
||||||
uint length;
|
uint length;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user