From f57c71b1ef568c1b83c4a908b941a12c8dfed1b2 Mon Sep 17 00:00:00 2001
From: dirk <dirk@FreeBSD.org>
Date: Sun, 10 Nov 2002 20:24:24 +0000
Subject: Only kill mysqld we started. Don't kill all mysqld.

Submitted by:	sobomax (modified by me a bit)
---
 databases/mysql54-server/files/mysql-server.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'databases/mysql54-server/files')

diff --git a/databases/mysql54-server/files/mysql-server.sh b/databases/mysql54-server/files/mysql-server.sh
index 6cc4f30ee2df..f22cbd0c8235 100644
--- a/databases/mysql54-server/files/mysql-server.sh
+++ b/databases/mysql54-server/files/mysql-server.sh
@@ -1,14 +1,21 @@
 #!/bin/sh
 
+DB_DIR=%%DB_DIR%%
+PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid
+
 case "$1" in
 	start)
 		if [ -x %%PREFIX%%/bin/safe_mysqld ]; then
-			%%PREFIX%%/bin/safe_mysqld --user=mysql > /dev/null &
+			%%PREFIX%%/bin/safe_mysqld --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null &
 			echo -n ' mysqld'
 		fi
 		;;
 	stop)
-		/usr/bin/killall mysqld > /dev/null 2>&1 && echo -n ' mysqld'
+		if [ -f ${PIDFILE} ]; then
+			/bin/kill `cat ${PIDFILE}` > /dev/null 2>&1 && echo -n ' mysqld'
+		else
+			echo "mysql-server isn't running"
+		fi
 		;;
 	*)
 		echo ""
-- 
cgit