diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-07-26 23:08:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-07-26 23:08:38 +0200 |
| commit | 1987819281eba73cac7ff04082f8f9c024b7a54f (patch) | |
| tree | c99b1e49fea8325cf7c8bb947d084780153fb95c /support-files | |
| parent | 42b975881432861becb8e93f75aec1e50979a08a (diff) | |
| download | mariadb-git-1987819281eba73cac7ff04082f8f9c024b7a54f.tar.gz | |
MDEV-6428 [PATCH] MariaDB start script doesn't realize failure of MariaDB startup
abort the wait loop if mysqld_safe is not running
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index a1ee5c4c653..a19f09fc91f 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -259,6 +259,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 echo $echo_n ".$echo_c" |