1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

export forced_defaults_file using global variable defaults_file

Browse Source 
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
This commit is contained in:
unknown 2005-09-30 09:54:53 +02:00
parent 6532bfdd47
commit 3b49f80aba
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/my_sys.h
View File

@ -262,6 +262,7 @@ extern char wild_many,wild_one,wild_prefix;
extern const char *charsets_dir; extern const char *charsets_dir;
extern char *defaults_extra_file; extern char *defaults_extra_file;
extern const char *defaults_group_suffix; extern const char *defaults_group_suffix;
extern const char *defaults_file;
extern my_bool timed_mutexes; extern my_bool timed_mutexes;

4
mysys/default.c
View File

@ -42,6 +42,7 @@
#include <winbase.h> #include <winbase.h>
#endif #endif
const char *defaults_file=0;
const char *defaults_group_suffix=0; const char *defaults_group_suffix=0;
char *defaults_extra_file=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) if (forced_extra_defaults)
defaults_extra_file= 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 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' load_defaults() as otherwise we can't know the type of 'func_ctx'