File tree Expand file tree Collapse file tree 1 file changed +8
-12
lines changed Expand file tree Collapse file tree 1 file changed +8
-12
lines changed Original file line number Diff line number Diff line change @@ -110,17 +110,13 @@ _start_server() {
110110}
111111
112112_stop_server () {
113- local server_pid=" $1 "
114- kill " $server_pid "
115- for i in $( seq 1 60) ; do
116- sleep 1
117- if ! $( pidof /usr/sbin/mysqld > /dev/null 2>&1 ) ; then
118- return 0
119- fi
120- done
121- # The server hasn't shut down in a timely manner
122- _error " Unable to shut down server with process id $server_pid "
123-
113+ local passfile=$1
114+ local socket=$2
115+ result=0
116+ mysqladmin --defaults-extra-file=" ${passfile} " shutdown -uroot --socket=" ${socket} " || result=$?
117+ if [ ! " $result " = " 0" ]; then
118+ _error " Unable to shut down server. Status code $result ."
119+ fi
124120}
125121# allow the container to be started with `--user`
126122if [ " $1 " = ' mysqld' -a -z " $wantHelp " -a " $( id -u) " = ' 0' ]; then
238234 EOSQL
239235 fi
240236 _note " Stopping server"
241- _stop_server $pid
237+ _stop_server " ${PASSFILE} " " ${SOCKET} "
242238 _note " Server stopped"
243239 rm -f " ${PASSFILE} "
244240 unset PASSFILE
You can’t perform that action at this time.
0 commit comments