mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
BUG# 4466 - Nothing in .err when mysql service ends because of malformed my.ini options
mysqld.cc: Changed option_error_reporter to match new function header that includes LOGLEVEL enum mysql_priv.h: Removed the MY_ERROR style bitmask. Changed function headers to use new LOGLEVEL enum log.cc: Changed print_buffer_to_log to print_buffer_to_file. Remove the timestamp bool and now all log entries written to stderr are timestamped. Removed some unused commented code. changed to use the new LOGLEVEL enum. my_getopt.c: Changed functions to use the new LOGLEVEL enum and changed the included error reporter to be default_reporter. This reporter is used in handle_options if a reporter is not given my_getopt.h: changed typedefs to use better naming convention. Moved error bitmask into the LOGLEVEL enum and included it here.
This commit is contained in:
@ -24,6 +24,7 @@
|
||||
#include <thr_lock.h>
|
||||
#include <my_base.h> /* Needed by field.h */
|
||||
#include <my_bitmap.h>
|
||||
#include <my_getopt.h>
|
||||
|
||||
#ifdef __EMX__
|
||||
#undef write /* remove pthread.h macro definition for EMX */
|
||||
@ -639,21 +640,10 @@ void key_unpack(String *to,TABLE *form,uint index);
|
||||
bool check_if_key_used(TABLE *table, uint idx, List<Item> &fields);
|
||||
void init_errmessage(void);
|
||||
|
||||
void vprint_msg_to_log( long errType, my_bool timestamp, const char *format, va_list args );
|
||||
void print_msg_to_log( long errType, my_bool timestamp, const char *format, ... );
|
||||
void vprint_msg_to_log( enum LOGLEVEL level, const char *format, va_list args );
|
||||
void print_msg_to_log( enum LOGLEVEL level, const char *format, ... );
|
||||
void sql_perror(const char *message);
|
||||
/* __attribute__ ((format (printf, 1, 2)));
|
||||
*/
|
||||
|
||||
#define MY_ERROR_TYPE 0x0001
|
||||
#define MY_WARNING_TYPE 0x0002
|
||||
#define MY_INFORMATION_TYPE 0x0004
|
||||
|
||||
/*void sql_init_perror(const char *message);*/
|
||||
/*void sql_fprintf(const char *format,...)
|
||||
__attribute__ ((format (printf, 1, 2)));*/
|
||||
|
||||
/*#define sql_fprintf(format, args...) fprintf (stderr, format, ##args) */
|
||||
void sql_print_error( const char *format, ... );
|
||||
void sql_print_warning( const char *format, ...);
|
||||
void sql_print_information( const char *format, ...);
|
||||
|
Reference in New Issue
Block a user