Commit 7e6d938f authored by Nirbhay Choubey's avatar Nirbhay Choubey

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.
parent 4015719c
...@@ -140,7 +140,7 @@ static int search_default_file_with_ext(Process_option_func func, ...@@ -140,7 +140,7 @@ static int search_default_file_with_ext(Process_option_func func,
- Unix: /etc/ - Unix: /etc/
- Unix: /etc/mysql/ - Unix: /etc/mysql/
- Unix: --sysconfdir=<path> (compile-time option) - Unix: --sysconfdir=<path> (compile-time option)
- ALL: getenv(DEFAULT_HOME_ENV) - ALL: getenv("MYSQL_HOME")
- ALL: --defaults-extra-file=<path> (run-time option) - ALL: --defaults-extra-file=<path> (run-time option)
- Unix: ~/ - Unix: ~/
...@@ -1232,7 +1232,7 @@ static const char **init_default_directories(MEM_ROOT *alloc) ...@@ -1232,7 +1232,7 @@ static const char **init_default_directories(MEM_ROOT *alloc)
#endif #endif
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV)))) if ((env= getenv("MYSQL_HOME")))
errors += add_directory(alloc, env, dirs); errors += add_directory(alloc, env, dirs);
/* Placeholder for --defaults-extra-file=<path> */ /* Placeholder for --defaults-extra-file=<path> */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment