Commit 8d5edfda authored by unknown's avatar unknown
Browse files

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

into siva.hindu.god:/opt/home/tim/m/50/a
parents 3f7b0f70 f0112142

scripts/mysqld_safe.sh

+1 −1
Original line number Diff line number Diff line
@@ -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