bzr merge -r4346 maria/10.0 (maria-10.0.13)

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