diff options
| author | unknown <ramil@mysql.com> | 2005-09-09 12:51:43 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-09-09 12:51:43 +0500 |
| commit | af05c8d303a09f7ef70017e63977c0f40e75159a (patch) | |
| tree | 98136779b969a67a5385dae421715cb7a56c9682 /mysys/default.c | |
| parent | 65ba93fda94e153ee66ed01824ae40296250e5ff (diff) | |
| download | mariadb-git-af05c8d303a09f7ef70017e63977c0f40e75159a.tar.gz | |
A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
mysql-test/mysql-test-run.pl:
A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
MYSQL_MY_PRINT_DEFAULTS added
mysql-test/mysql-test-run.sh:
A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
MYSQL_MY_PRINT_DEFAULTS added
mysys/default.c:
A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries).
Set defaults_extra_file as we use it widely.
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 3 |
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 |