bzr commit into mysql-5.5 branch (nirbhay.choubey:3371) Bug#11766219

[Nirbhay Choubey]

#At file:///home/nirbhay/Project/mysql/repo/bugs/source/mysql-5.5.59280/ based on revid:build@stripped

 3371 Nirbhay Choubey	2011-03-04
      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.

    modified:
      mysys/default.c
=== modified file 'mysys/default.c'
--- a/mysys/default.c	2011-02-08 10:21:14 +0000
+++ b/mysys/default.c	2011-03-04 14:42:33 +0000
@@ -140,7 +140,7 @@ static int search_default_file_with_ext(
   - 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_directo
 
 #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> */


Attachment: [text/bzr-bundle]