bk commit into 5.0 tree (tim:1.1924)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tim. When tim 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.1924 05/05/27 12:44:06 tim@stripped +1 -0
  scripts/mysqld_safe.sh
      Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable.

  scripts/mysqld_safe.sh
    1.78 05/05/27 12:43:16 tim@stripped +1 -1
    Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable.
    Without this patch, running mysqld_safe gives:
    
    Could not open required defaults file: /opt/home/tim/m/50/m/data/my.cnf
    Fatal error in defaults handling. Program aborted
    Could not open required defaults file: /opt/home/tim/m/50/m/data/my.cnf
    Fatal error in defaults handling. Program aborted
    
    These errors are printed by my_print_defaults; mysqld also encounters the
    same problem and quits.

# 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:	tim
# Host:	siva.hindu.god
# Root:	/opt/home/tim/m/50/a

--- 1.77/scripts/mysqld_safe.sh	2005-04-26 22:03:33 +12:00
+++ 1.78/scripts/mysqld_safe.sh	2005-05-27 12:43:16 +12:00
@@ -114,7 +114,7 @@
   MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
   ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
   DATADIR=$MY_BASEDIR_VERSION/data
-  if test -z "$defaults"
+  if test -z "$defaults" -a -r "$DATADIR/my.cnf"
   then
     defaults="--defaults-extra-file=$DATADIR/my.cnf"
   fi