summaryrefslogtreecommitdiff
path: root/mysys/default.c
diff options
context:
space:
mode:
authorramil@mysql.com <>2005-09-09 12:51:43 +0500
committerramil@mysql.com <>2005-09-09 12:51:43 +0500
commit9730b5369a9dc6d4f08524441727ceca72e1d072 (patch)
tree98136779b969a67a5385dae421715cb7a56c9682 /mysys/default.c
parent871ac087c3c8de4353789a8634fd6cec8fd51ca0 (diff)
downloadmariadb-git-9730b5369a9dc6d4f08524441727ceca72e1d072.tar.gz
A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
Diffstat (limited to 'mysys/default.c')
-rw-r--r--mysys/default.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysys/default.c b/mysys/default.c
index bde7cbf2563..bca3ec0fed3 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -136,6 +136,9 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv,
if (! defaults_group_suffix)
defaults_group_suffix= getenv(STRINGIFY_ARG(DEFAULT_GROUP_SUFFIX_ENV));
+
+ if (forced_extra_defaults)
+ defaults_extra_file= forced_extra_defaults;
/*
We can only handle 'defaults-group-suffix' if we are called from