Commit 3b49f80a authored by unknown's avatar unknown
Browse files

export forced_defaults_file using global variable defaults_file 

 analog with defaults_extra_file and defaults_grouop_suffix


include/my_sys.h:
  export forced_defaults_file using global variable defaults_file
mysys/default.c:
  export forced_defaults_file using global variable defaults_file
parent 6532bfdd

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ extern char wild_many,wild_one,wild_prefix; 
extern const char *charsets_dir;

extern char *defaults_extra_file;

extern const char *defaults_group_suffix;

extern const char *defaults_file;



extern my_bool timed_mutexes;

mysys/default.c

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <winbase.h>

#endif



const char *defaults_file=0;

const char *defaults_group_suffix=0;

char *defaults_extra_file=0;
@@ -140,6 +141,9 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv, 
  if (forced_extra_defaults)

    defaults_extra_file= forced_extra_defaults;

  

  if (forced_default_file)

    defaults_file= forced_default_file;



  /*

    We can only handle 'defaults-group-suffix' if we are called from

    load_defaults() as otherwise we can't know the type of 'func_ctx'