diff options
| author | Nirbhay Choubey <nirbhay.choubey@sun.com> | 2011-03-04 21:03:39 +0530 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay.choubey@sun.com> | 2011-03-04 21:03:39 +0530 |
| commit | 7e6d938f575af3bf31bf6477a6c6585e24522103 (patch) | |
| tree | b2e7e3754d495b2b5057161715d09eb5ebe9a46f | |
| parent | 4015719c01c679544d47f4a788756128d9c34b93 (diff) | |
| download | mariadb-git-7e6d938f575af3bf31bf6477a6c6585e24522103.tar.gz | |
BUG#11766219 : 59280: $MYSQL_HOME IS NOT USED FOR THE
CLIENT CONFIGURATION.
At startup, MySQL server/client programs do not read
configuration file pointed by MYSQL_HOME environment
variable.
This happened as, this environment variable was
handled by a different variable (DEFAULT_HOME_ENV)
in the code, which was ne'er initialized.
Fixed by changing it to MYSQL_HOME.
mysys/default.c:
BUG 11766219 : 59280: $MYSQL_HOME IS NOT USED FOR THE
CLIENT CONFIGURATION.
In the current build environment, the variable
DEFAULT_HOME_ENV is no more found being initialized
to MYSQL_HOME (as was the case earlier). Changed the
variable name to MYSQL_HOME.
| -rw-r--r-- | mysys/default.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/default.c b/mysys/default.c index 9a4b990f003..805dc5f3f58 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -140,7 +140,7 @@ static int search_default_file_with_ext(Process_option_func func, - Unix: /etc/ - Unix: /etc/mysql/ - Unix: --sysconfdir=<path> (compile-time option) - - ALL: getenv(DEFAULT_HOME_ENV) + - ALL: getenv("MYSQL_HOME") - ALL: --defaults-extra-file=<path> (run-time option) - Unix: ~/ @@ -1232,7 +1232,7 @@ static const char **init_default_directories(MEM_ROOT *alloc) #endif - if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV)))) + if ((env= getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs); /* Placeholder for --defaults-extra-file=<path> */ |