Commit f2ef3d16 authored by unknown's avatar unknown
Browse files

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
parent 87bce854

include/my_getopt.h

+0 −6
Original line number Diff line number Diff line
@@ -53,12 +53,6 @@ struct my_option 
extern char *disabled_my_option;

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 void (* my_error_reporter) (enum loglevel level, const char *format, ... );

include/my_sys.h

+6 −0
Original line number Diff line number Diff line
@@ -261,6 +261,12 @@ typedef struct st_typelib { /* Different types saved here */ 
  const char **type_names;

} TYPELIB;



enum loglevel {

   ERROR_LEVEL,

   WARNING_LEVEL,

   INFORMATION_LEVEL

};



enum cache_type

{

  READ_CACHE,WRITE_CACHE,

mysys/my_getopt.c

+1 −1
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
#include <my_global.h>

#include <m_string.h>

#include <stdlib.h>

#include <my_getopt.h>

#include <assert.h>

#include <my_sys.h>

#include <mysys_err.h>

#include <my_getopt.h>



static int findopt(char *optpat, uint length,

		   const struct my_option **opt_res,