diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-07-15 00:54:29 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-07-15 00:54:29 -0400 |
| commit | 9c3f623777237d2a5f6104baf3dc657ef03a747c (patch) | |
| tree | 1fbe48ae8ccedb4d44439901e10331499b639b17 /scripts | |
| parent | 3ce3647055c0749b6a2029b85f179146b5e8b2be (diff) | |
| download | mariadb-git-9c3f623777237d2a5f6104baf3dc657ef03a747c.tar.gz | |
MDEV-4728: MariaDB can't start while bootup
Introduced safety checks to ensure mysqld_safe terminates
if mktemp fails to create a valid file.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 09ac77785af..d4f936f33f5 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -229,8 +229,19 @@ wsrep_recover_position() { local wr_logfile=$(mktemp $DATADIR/wsrep_recovery.XXXXXX) - [ "$euid" = "0" ] && chown $user $wr_logfile - chmod 600 $wr_logfile + # safety checks + if [ -z $wr_logfile ]; then + log_error "WSREP: mktemp failed" + return 1 + fi + + if [ -f $wr_logfile ]; then + [ "$euid" = "0" ] && chown $user $wr_logfile + chmod 600 $wr_logfile + else + log_error "WSREP: mktemp failed" + return 1 + fi local wr_pidfile="$DATADIR/"`@HOSTNAME@`"-recover.pid" |