bzr push into mysql-trunk branch (nirbhay.choubey:3726 to 3727) Bug#11766219

[Nirbhay Choubey]

 3727 Nirbhay Choubey	2011-03-04 [merge]
      Merge of fix for bug#11766219 from mysql-5.5 -> mysql-trunk.

    modified:
      mysys/default.c
 3726 Jorgen Loland	2011-03-04 [merge]
      Merge BUG#11766317 from 5.5 to trunk
     @ mysql-test/r/func_set.result
        Add test for BUG#59405
     @ mysql-test/t/func_set.test
        Add test for BUG#59405
     @ sql/item_func.cc
        Add variable Item_func_find_in_set::args_0_null_value

    modified:
      mysql-test/r/func_set.result
      mysql-test/t/func_set.test
      sql/item_func.cc
=== modified file 'mysys/default.c'
--- a/mysys/default.c	2011-02-09 22:34:20 +0000
+++ b/mysys/default.c	2011-03-04 15:38:00 +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:        ~/
 
@@ -1234,7 +1234,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]