summaryrefslogtreecommitdiff
path: root/support-files/mysql.server.sh
diff options
context:
space:
mode:
Diffstat (limited to 'support-files/mysql.server.sh')
-rw-r--r--support-files/mysql.server.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index c12f4cf4a3a..025b9e8cf31 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -262,6 +262,11 @@ wait_for_ready () {
if $bindir/mysqladmin ping >/dev/null 2>&1; then
log_success_msg
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
if test -e $sst_progress_file && [ $startup_sleep -ne 10 ];then