diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2005-09-30 12:25:39 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2005-09-30 12:25:39 +0200 |
| commit | d3febe80ecc561a9ac2aa5fe1c91006099b8b1d4 (patch) | |
| tree | a72a7ce3e7a9010cd312bf2f74655f31ca4a25e4 /mysys | |
| parent | c7853e4775cd43efd8d2436255dc8940a870255a (diff) | |
| parent | 8aebd06284160652bd14ccc6ecb52bd04ae4ba09 (diff) | |
| download | mariadb-git-d3febe80ecc561a9ac2aa5fe1c91006099b8b1d4.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
include/my_sys.h:
Auto merged
mysys/default.c:
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' |