diff options
| author | pekka@mysql.com <> | 2005-04-01 10:13:37 +0200 |
|---|---|---|
| committer | pekka@mysql.com <> | 2005-04-01 10:13:37 +0200 |
| commit | 5b9bd8c0c8ec48f54459b5025fe42dbce261645b (patch) | |
| tree | 748a9a8f5a64181143501a3ccc782f1dfa1af35f /support-files/mysql.server.sh | |
| parent | 45a79c9056437dedd7334afee422566f68df4991 (diff) | |
| parent | 7ace3f136264fbc7de3e50e047ad5f88653c6c3c (diff) | |
| download | mariadb-git-5b9bd8c0c8ec48f54459b5025fe42dbce261645b.tar.gz | |
Merge
Diffstat (limited to 'support-files/mysql.server.sh')
| -rw-r--r-- | support-files/mysql.server.sh | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index ce35fd50832..2735ad91c6e 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -102,7 +102,18 @@ wait_for_pid () { i=0 while test $i -lt 35 ; do sleep 1 - test -s $pid_file && i='' && break + case "$1" in + 'created') + test -s $pid_file && i='' && break + ;; + 'removed') + test ! -s $pid_file && i='' && break + ;; + *) + echo "wait_for_pid () usage: wait_for_pid created|removed" + exit 1 + ;; + esac echo $echo_n ".$echo_c" i=`expr $i + 1` done @@ -198,7 +209,7 @@ case "$mode" in # be overwritten at next upgrade. echo $echo_n "Starting MySQL" $sbindir/mysqlmanager $USER_OPTION --pid-file=$pid_file >/dev/null 2>&1 & - wait_for_pid + wait_for_pid created # Make lock for RedHat / SuSE if test -w /var/lock/subsys @@ -219,7 +230,7 @@ case "$mode" in echo $echo_n "Shutting down MySQL" kill $mysqlmanager_pid # mysqlmanager should remove the pid_file when it exits, so wait for it. - wait_for_pid + wait_for_pid removed # delete lock for RedHat / SuSE if test -f /var/lock/subsys/mysqlmanager |