database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

MDEV-5892 Centos startup script is broken

Browse Source 
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).
This commit is contained in:
Sergei Golubchik
2014-03-19 10:02:41 +01:00
parent 0c84a47c97
commit 9950c5c7ba
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
support-files/mysql.server.sh
View File

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