diff options
author | unknown <jonas@perch.ndb.mysql.com> | 2005-09-30 09:54:53 +0200 |
---|---|---|
committer | unknown <jonas@perch.ndb.mysql.com> | 2005-09-30 09:54:53 +0200 |
commit | 3b49f80aba520fa6ff8ab5952ed0ee348ba32c3d (patch) | |
tree | 063f4144e0d1483778e1490a26a7b148b8906296 /mysys | |
parent | 6532bfdd4748bfaf32b999585a63ad61cd80549e (diff) | |
download | mariadb-git-3b49f80aba520fa6ff8ab5952ed0ee348ba32c3d.tar.gz |
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
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/default.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysys/default.c b/mysys/default.c index bca3ec0fed3..9f47b09a4b0 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -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' |