*** mysqld_safe.sh      2010-07-09 14:34:58.000000000 +0200
--- mysqld_safe.sh      2010-08-16 16:10:37.000000000 +0200
***************
*** 249,255 ****
  #
  
  # Try where the binary installs put it
! if test -d $MY_BASEDIR_VERSION/data/mysql
  then
    DATADIR=$MY_BASEDIR_VERSION/data
    if test -z "$defaults" -a -r "$DATADIR/my.cnf"
--- 249,255 ----
  #
  
  # Try where the binary installs put it
! if test -d "$MY_BASEDIR_VERSION/data/mysql"
  then
    DATADIR=$MY_BASEDIR_VERSION/data
    if test -z "$defaults" -a -r "$DATADIR/my.cnf"
***************
*** 262,268 ****
    DATADIR=$MY_BASEDIR_VERSION/var
  # Or just give up and use our compiled-in default
  else
!   DATADIR=@localstatedir@
  fi
  
  if test -z "$MYSQL_HOME"
--- 262,268 ----
    DATADIR=$MY_BASEDIR_VERSION/var
  # Or just give up and use our compiled-in default
  else
!   DATADIR='@localstatedir@'
  fi
  
  if test -z "$MYSQL_HOME"
***************
*** 296,307 ****
  elif test -x ./bin/my_print_defaults
  then
    print_defaults="./bin/my_print_defaults"
! elif test -x @bindir@/my_print_defaults
  then
!   print_defaults="@bindir@/my_print_defaults"
! elif test -x @bindir@/mysql_print_defaults
  then
!   print_defaults="@bindir@/mysql_print_defaults"
  else
    print_defaults="my_print_defaults"
  fi
--- 296,307 ----
  elif test -x ./bin/my_print_defaults
  then
    print_defaults="./bin/my_print_defaults"
! elif test -x '@bindir@/my_print_defaults'
  then
!   print_defaults='@bindir@/my_print_defaults'
! elif test -x '@bindir@/mysql_print_defaults'
  then
!   print_defaults='@bindir@/mysql_print_defaults'
  else
    print_defaults="my_print_defaults"
  fi
***************
*** 313,325 ****
  args=
  
  SET_USER=2
! parse_arguments `$print_defaults $defaults --loose-verbose mysqld server`
  if test $SET_USER -eq 2
  then
    SET_USER=0
  fi
  
! parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld`
  parse_arguments PICK-ARGS-FROM-ARGV "$@"
  
  # Determine what logging facility to use
--- 313,325 ----
  args=
  
  SET_USER=2
! parse_arguments `"$print_defaults" "$defaults" --loose-verbose mysqld server`
  if test $SET_USER -eq 2
  then
    SET_USER=0
  fi
  
! parse_arguments `"$print_defaults" "$defaults" --loose-verbose mysqld_safe safe_mysqld`
  parse_arguments PICK-ARGS-FROM-ARGV "$@"
  
  # Determine what logging facility to use