bk commit into 4.0 tree (1.1479)

Below is the list of changes that have just been committed into a local
4.0 repository of monty. When monty 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1479 03/04/28 12:00:04 monty@xxxxxxxxxxxxxxx +1 -0
  Use my.cnf file from datadir even if datadir is different from the default 
one.

  support-files/mysql.server.sh
    1.28 03/04/28 12:00:02 monty@xxxxxxxxxxxxxxx +12 -1
    Use my.cnf file from datadir even if datadir is different from the default 
one.

# 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: monty
# Host: mashka.mysql.fi
# Root: /home/my/mysql-4.0

--- 1.27/support-files/mysql.server.sh  Fri Apr 11 14:02:14 2003
+++ 1.28/support-files/mysql.server.sh  Mon Apr 28 12:00:02 2003
@@ -118,7 +118,18 @@
   test -z "$print_defaults" && print_defaults="my_print_defaults"
 fi
 
-parse_arguments `$print_defaults mysqld mysql_server mysql.server`
+#
+# Test if someone changed datadir;  In this case we should also read the
+# default arguments from this directory
+#
+
+extra_args=""
+if test "$datadir" != "@localstatedir@"
+then
+  extra_args="-e $datadir/my.cnf"
+fi
+
+parse_arguments `$print_defaults $extra_args mysqld mysql_server mysql.server`
 
 # Safeguard (relative paths, core dumps..)
 cd $basedir

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx