diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-04-16 12:13:43 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-04-16 12:13:43 +0300 |
| commit | 150e88e8c9b85e3e6ce500a91fd215d231e99881 (patch) | |
| tree | e029a8c9beae4cf67edc5239694c68f8b4de28c0 /support-files/mysql.server.sh | |
| parent | 983366e0eef50b95329bcba154ee4fb38b85df3c (diff) | |
| parent | 142c20eda9d287f7f898dd8d89821f0e809dafc6 (diff) | |
| download | mariadb-git-150e88e8c9b85e3e6ce500a91fd215d231e99881.tar.gz | |
Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.
Diffstat (limited to 'support-files/mysql.server.sh')
| -rw-r--r-- | support-files/mysql.server.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index b763117188f..b9bd37cbcea 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -148,7 +148,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 @@ -258,10 +257,11 @@ wait_for_ready () { test -n "$socket" && sockopt="--socket=$socket" sst_progress_file=$datadir/sst_in_progress + 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 @@ -293,6 +293,11 @@ else esac fi +# source other config files +[ -f /etc/default/mysql ] && . /etc/default/mysql +[ -f /etc/sysconfig/mysql ] && . /etc/sysconfig/mysql +[ -f /etc/conf.d/mysql ] && . /etc/conf.d/mysql + case "$mode" in 'start') # Start daemon |