summaryrefslogtreecommitdiff
path: root/support-files/mysql.server.sh
diff options
context:
space:
mode:
Diffstat (limited to 'support-files/mysql.server.sh')
-rw-r--r--support-files/mysql.server.sh26
1 files changed, 13 insertions, 13 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index 89d45e0f26d..36eb5c4dff6 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -109,19 +109,6 @@ else
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
#
@@ -134,6 +121,19 @@ fi
parse_arguments `$print_defaults $extra_args mysqld mysql_server mysql.server`
+#
+# 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
+
# Safeguard (relative paths, core dumps..)
cd $basedir