From e05ea7b8ea985dbb2daa56f7b02baa4b65dd9503 Mon Sep 17 00:00:00 2001
From: unknown <monty@narttu.mysql.fi>
Date: Fri, 24 Oct 2003 14:22:54 +0300
Subject: Move the pid file testing after arguments are parsed (previous patch
 was not correct)

---
 support-files/mysql.server.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'support-files/mysql.server.sh')

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
@@ -108,19 +108,6 @@ 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
@@ -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
 
-- 
cgit v1.2.1