Merge bk-internal:/home/bk/mysql-5.0

into siva.hindu.god:/opt/home/tim/m/50/a
2005-06-01 11:43:15 +12:00 · 2005-06-01 11:43:15 +12:00 · 6077a08aab
commit 6077a08aab
parent 76073d7bf5 8a77c6f741
1 changed files with 1 additions and 1 deletions
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@ -114,7 +114,7 @@ then
  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