Merge with 4.0.16

support-files/mysql.server.sh

@@ -57,16 +57,6 @@ fi
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin
 export PATH
 
-if test -z "$pid_file"
-then
-  pid_file=$datadir/`@HOSTNAME@`.pid
-else
-  case "$pid_file" in
-    /* ) ;;
-    * )  pid_file="$datadir/$pid_file" ;;
-  esac
-fi
-
 mode=$1    # start or stop
 
 parse_arguments() {
@@ -118,6 +108,19 @@ else
   test -z "$print_defaults" && print_defaults="my_print_defaults"
 fi
 
+#
+# Set pid file if not given
+#
+if test -z "$pid_file"
+then
+  pid_file=$datadir/`@HOSTNAME@`.pid
+else
+  case "$pid_file" in
+    /* ) ;;
+    * )  pid_file="$datadir/$pid_file" ;;
+  esac
+fi
+
 #
 # Test if someone changed datadir;  In this case we should also read the
 # default arguments from this directory
@@ -178,7 +181,7 @@ case "$mode" in
       # delete lock for RedHat / SuSE
       if test -f /var/lock/subsys/mysql
       then
-        rm /var/lock/subsys/mysql
+        rm -f /var/lock/subsys/mysql
       fi
     else
       echo "No mysqld pid file found. Looked for $pid_file."