bk commit into 5.1 tree (msvensson:1.2190)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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
  1.2190 06/04/10 15:13:11 msvensson@shellback.(none) +2 -0
  Merge shellback.(none):/home/msvensson/mysql/bug15069/my50-bug15069
  into  shellback.(none):/home/msvensson/mysql/bug15069/my51-bug15069

  mysys/default.c
    1.79 06/04/10 15:13:01 msvensson@shellback.(none) +0 -0
    Auto merged

  mysys/Makefile.am
    1.74 06/04/10 15:13:01 msvensson@shellback.(none) +0 -0
    Auto merged

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/bug15069/my51-bug15069/RESYNC

--- 1.73/mysys/Makefile.am	2006-02-24 22:20:43 +01:00
+++ 1.74/mysys/Makefile.am	2006-04-10 15:13:01 +02:00
@@ -71,6 +71,7 @@
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
 			-DDEFAULT_HOME_ENV=MYSQL_HOME \
 			-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
+			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
                         @DEFS@
 
 libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@

--- 1.78/mysys/default.c	2005-10-06 10:25:57 +02:00
+++ 1.79/mysys/default.c	2006-04-10 15:13:01 +02:00
@@ -48,7 +48,7 @@
 
 /* Which directories are searched for options (and in which order) */
 
-#define MAX_DEFAULT_DIRS 6
+#define MAX_DEFAULT_DIRS 7
 const char *default_directories[MAX_DEFAULT_DIRS + 1];
 
 #ifdef __WIN__
@@ -959,11 +959,13 @@
     4. getenv(DEFAULT_HOME_ENV)
     5. Directory above where the executable is located
     6. ""
+    7. --sysconfdir=<path>
 
   On Novell NetWare, this is:
     1. sys:/etc/
     2. getenv(DEFAULT_HOME_ENV)
     3. ""
+    4. --sysconfdir=<path>
 
   On OS/2, this is:
     1. getenv(ETC)
@@ -971,12 +973,14 @@
     3. getenv(DEFAULT_HOME_ENV)
     4. ""
     5. "~/"
+    6. --sysconfdir=<path>
 
   Everywhere else, this is:
     1. /etc/
     2. getenv(DEFAULT_HOME_ENV)
     3. ""
     4. "~/"
+    5. --sysconfdir=<path>
 
  */
 
@@ -1040,6 +1044,10 @@
     }
     *ptr++= (char *)&config_dir;
   }
+#endif
+#ifdef DEFAULT_SYSCONFDIR
+  if (DEFAULT_SYSCONFDIR != "")
+    *ptr++= DEFAULT_SYSCONFDIR;
 #endif
   *ptr= 0;			/* end marker */
 }