From eaa0fe7cf859ad822f71bbaa2a47b23b4963ba9d Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@skysql.com>
Date: Tue, 15 Jul 2014 01:01:49 -0400
Subject: [PATCH] MDEV-4728: local merge from maria-5.5-galera.

---
 scripts/mysqld_safe.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 33b1300492f..e7eb2e72cbd 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"