Browse Source

MDEV-5892 Centos startup script is broken

Don't try to be smart about --socket.
Assume that if user has set up a non-standard location for a socket,
she did it consistently for both a server and clients
(otherwise most clients won't work anyway).
pull/374/head
Sergei Golubchik 12 years ago
parent
commit
9950c5c7ba
  1. 5
      support-files/mysql.server.sh

5
support-files/mysql.server.sh

@ -147,7 +147,6 @@ parse_server_arguments() {
datadir_set=1
;;
--pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--socket=*) socket=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
esac
done
@ -254,12 +253,10 @@ wait_for_gone () {
wait_for_ready () {
test -n "$socket" && sockopt="--socket=$socket"
i=0
while test $i -ne $service_startup_timeout ; do
if $bindir/mysqladmin $sockopt ping >/dev/null 2>&1; then
if $bindir/mysqladmin ping >/dev/null 2>&1; then
log_success_msg
return 0
fi

Loading…
Cancel
Save