summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-03-19 10:02:41 +0100
committerSergei Golubchik <sergii@pisem.net>2014-03-19 10:02:41 +0100
commit9950c5c7ba16b0329f63d2fe2d24ca1f3feab6fc (patch)
tree4128afcf4112ad86016478104791bfb3c7e4444f /support-files
parent0c84a47c972935d62398321c129c3bbb545c4d43 (diff)
downloadmariadb-git-9950c5c7ba16b0329f63d2fe2d24ca1f3feab6fc.tar.gz
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).
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.server.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index 3eb69941551..cb55b21ca7b 100644
--- a/support-files/mysql.server.sh
+++ b/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