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
my_getopt.c: Moved the inclusion of my_getopt.h down below the inclusion of my_sys.h so that enum loglevel definition would be available my_sys.h, my_getopt.h: moved definition of enum loglevel from my_getopt.h to my_sys.h include/my_getopt.h: moved definition of enum loglevel from my_getopt.h to my_sys.h include/my_sys.h: moved definition of enum loglevel from my_getopt.h to my_sys.h mysys/my_getopt.c: Moved the inclusion of my_getopt.h down below the inclusion of my_sys.h so that enum loglevel definition would be available
This commit is contained in:
@ -53,12 +53,6 @@ struct my_option
|
|||||||
extern char *disabled_my_option;
|
extern char *disabled_my_option;
|
||||||
extern my_bool my_getopt_print_errors;
|
extern my_bool my_getopt_print_errors;
|
||||||
|
|
||||||
enum loglevel {
|
|
||||||
ERROR_LEVEL,
|
|
||||||
WARNING_LEVEL,
|
|
||||||
INFORMATION_LEVEL
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef my_bool (* my_get_one_option) (int, const struct my_option *, char * );
|
typedef my_bool (* my_get_one_option) (int, const struct my_option *, char * );
|
||||||
typedef void (* my_error_reporter) (enum loglevel level, const char *format, ... );
|
typedef void (* my_error_reporter) (enum loglevel level, const char *format, ... );
|
||||||
|
|
||||||
|
@ -261,6 +261,12 @@ typedef struct st_typelib { /* Different types saved here */
|
|||||||
const char **type_names;
|
const char **type_names;
|
||||||
} TYPELIB;
|
} TYPELIB;
|
||||||
|
|
||||||
|
enum loglevel {
|
||||||
|
ERROR_LEVEL,
|
||||||
|
WARNING_LEVEL,
|
||||||
|
INFORMATION_LEVEL
|
||||||
|
};
|
||||||
|
|
||||||
enum cache_type
|
enum cache_type
|
||||||
{
|
{
|
||||||
READ_CACHE,WRITE_CACHE,
|
READ_CACHE,WRITE_CACHE,
|
||||||
|
@ -17,10 +17,10 @@
|
|||||||
#include <my_global.h>
|
#include <my_global.h>
|
||||||
#include <m_string.h>
|
#include <m_string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <my_getopt.h>
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <my_sys.h>
|
#include <my_sys.h>
|
||||||
#include <mysys_err.h>
|
#include <mysys_err.h>
|
||||||
|
#include <my_getopt.h>
|
||||||
|
|
||||||
static int findopt(char *optpat, uint length,
|
static int findopt(char *optpat, uint length,
|
||||||
const struct my_option **opt_res,
|
const struct my_option **opt_res,
|
||||||
|
Reference in New Issue
Block a user