From 199f2d02e83263076bcf3cca183c01556e22b596 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Thu, 9 Apr 2015 12:16:50 +0200
Subject: [PATCH] mysql: updated to 6.24, improved rc script

---
 mysql/.footprint |  1 +
 mysql/.md5sum    |  4 ++--
 mysql/Pkgfile    |  2 +-
 mysql/mysqld     | 27 +++++++++++++++++----------
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/mysql/.footprint b/mysql/.footprint
index fe631ed..14b1840 100644
--- a/mysql/.footprint
+++ b/mysql/.footprint
@@ -144,6 +144,7 @@ drwxr-xr-x	root/root	usr/lib/mysql/plugin/
 -rw-r--r--	root/root	usr/lib/mysql/plugin/daemon_example.ini
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/libdaemon_example.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/mypluglib.so
+-rwxr-xr-x	root/root	usr/lib/mysql/plugin/mysql_no_login.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/qa_auth_client.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/qa_auth_interface.so
 -rwxr-xr-x	root/root	usr/lib/mysql/plugin/qa_auth_server.so
diff --git a/mysql/.md5sum b/mysql/.md5sum
index 290e265..e1aeee9 100644
--- a/mysql/.md5sum
+++ b/mysql/.md5sum
@@ -1,4 +1,4 @@
 0bf963dec6788c90f82ab7b104b8f427  my.cnf
-60344f26eae136a267a0277407926e79  mysql-5.6.23.tar.gz
-642a596f13ebd7e459c5ff2fd382f06b  mysqld
+68e1911f70eb1b02170d4f96bf0f0f88  mysql-5.6.24.tar.gz
+464c23eafb83d93f24d2a04415db2202  mysqld
 53b421ec605c7d3c437daf10e70e9498  valist.patch
diff --git a/mysql/Pkgfile b/mysql/Pkgfile
index 34592fc..5b34a9b 100644
--- a/mysql/Pkgfile
+++ b/mysql/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: tcp_wrappers ncurses zlib openssl cmake libaio
 
 name=mysql
-version=5.6.23
+version=5.6.24
 release=1
 source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.6/$name-$version.tar.gz \
         my.cnf mysqld valist.patch)
diff --git a/mysql/mysqld b/mysql/mysqld
index 4775f33..eb9b74e 100644
--- a/mysql/mysqld
+++ b/mysql/mysqld
@@ -3,28 +3,35 @@
 # /etc/rc.d/mysqld: start/stop mysqld daemon
 #
 
+SSD=/sbin/start-stop-daemon
+PROG=/usr/sbin/mysqld
 MYSQL_CFG=/etc/my.cnf
-
-MYSQL_PID=`sed -n 's/^pid-file[ \t]*=[ \t]*//p' $MYSQL_CFG`
-MYSQL_USR=`sed -n 's/^user[ \t]*=[ \t]*//p' $MYSQL_CFG`
+PID=$(sed -n 's/^pid-file[ \t]*=[ \t]*//p' $MYSQL_CFG)
+USR=$(sed -n 's/^user[ \t]*=[ \t]*//p' $MYSQL_CFG)
 
 case $1 in
 start)
-	touch $MYSQL_PID
-	chown $MYSQL_USR $MYSQL_PID
-	/usr/sbin/mysqld &
+	touch $PID && chown $USR:$USR $PID
+	$SSD --start --background --pidfile $PID --exec $PROG
 	;;
 stop)
-	killall -q /usr/sbin/mysqld 
-	rm $MYSQL_PID
+	$SSD --stop --remove-pidfile --retry 10 --pidfile $PID
 	;;
 restart)
 	$0 stop
-	sleep 2
 	$0 start
 	;;
+status)
+	$SSD --status --pidfile $PID
+	case $? in
+	0) echo "$PROG is running with pid $(cat $PID)" ;;
+	1) echo "$PROG is not running but the pid file $PID exists" ;;
+	3) echo "$PROG is not running" ;;
+	4) echo "Unable to determine the program status" ;;
+	esac
+	;;
 *)
-	echo "usage: $0 [start|stop|restart]"
+	echo "usage: $0 [start|stop|restart|status]"
 	;;
 esac
 
-- 
2.26.2