Commit 19878192 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-6428 [PATCH] MariaDB start script doesn't realize failure of MariaDB startup

abort the wait loop if mysqld_safe is not running
parent 42b97588
...@@ -259,6 +259,11 @@ wait_for_ready () { ...@@ -259,6 +259,11 @@ wait_for_ready () {
if $bindir/mysqladmin 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
elif kill -0 $! 2>/dev/null ; then
: # mysqld_safe is still running
else
# mysqld_safe is no longer running, abort the wait loop
break
fi fi
echo $echo_n ".$echo_c" echo $echo_n ".$echo_c"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment