diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-30 15:29:01 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-30 15:29:01 +0300 |
| commit | 972da434a0043089b30e0de34ced367af3ab9ce1 (patch) | |
| tree | c298d66f44c0e962d1795971f31ba9ca0897efdc /mysys | |
| parent | 4dd483591c608621e6f631f8db4a1dbed2c62f23 (diff) | |
| parent | 1d31ee29fd78a4fbcf74da0271146fad3d0bc044 (diff) | |
| download | mariadb-git-972da434a0043089b30e0de34ced367af3ab9ce1.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
include/my_sys.h:
Auto merged
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 5c631abebad..edd02402a2a 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= (char *) 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' |