bk commit into 5.1 tree (mtaylor:1.2376)

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.1 repository of mtaylor. When mtaylor does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-15 13:23:57-08:00, mtaylor@qualinost.(none) +2 -0
  Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
  into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
  MERGE: 1.1810.2359.32

  mysql-test/r/myisam.result@stripped, 2006-12-15 13:23:51-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.71.1.24

  mysys/default.c@stripped, 2006-12-15 13:23:51-08:00, mtaylor@qualinost.(none) +0 -0
    Auto merged
    MERGE: 1.72.1.13

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mtaylor
# Host:	qualinost.(none)
# Root:	/home/mtaylor/src/mysql-5.1-maint/RESYNC

--- 1.83/mysys/default.c	2006-12-15 13:24:05 -08:00
+++ 1.84/mysys/default.c	2006-12-15 13:24:05 -08:00
@@ -987,10 +987,11 @@
 
   Everywhere else, this is:
     1. /etc/
-    2. getenv(DEFAULT_HOME_ENV)
-    3. ""
-    4. "~/"
-    5. --sysconfdir=<path>
+    2. /etc/mysql/
+    3. getenv(DEFAULT_HOME_ENV)
+    4. ""
+    5. "~/"
+    6. --sysconfdir=<path>
 
  */
 
@@ -1012,6 +1013,7 @@
   *ptr++= "sys:/etc/";
 #else
   *ptr++= "/etc/";
+  *ptr++= "/etc/mysql/";
 #endif
   if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
     *ptr++= env;