[packages/mysql] move status action to status function

[glen]

commit 0d6ce890d283f0d40bf6a6642702f4f264b365ac
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Apr 25 10:45:21 2013 +0300

    move status action to status function

 mysql.init | 72 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 38 insertions(+), 34 deletions(-)
---
diff --git a/mysql.init b/mysql.init
index f5cc30f..2a1a01d 100755
--- a/mysql.init
+++ b/mysql.init
@@ -622,40 +622,7 @@ condrestart() {
 	start
 }
 
-RETVAL=0
-case "$action" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart)
-	stop
-	start
-	;;
-  try-restart)
-	condrestart 0
-	;;
-  force-reload)
-	condrestart 7
-	;;
-  init)
-	for mysqldir in $DB_CLUSTERS; do
-		mysqlinit "$mysqldir"
-	done
-	exit $?
-	;;
-  flush-logs)
-	for mysqldir in $DB_CLUSTERS; do
-	    mysqlgetconfig "$mysqldir"
-		# just if mysqld is really running
-		if /usr/bin/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" ping >/dev/null 2>&1; then
-			/usr/bin/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" flush-logs
-		fi
-	done
-	;;
-  status)
+status() {
 	RETVAL=3
 	for mysqldir in $DB_CLUSTERS; do
 		mysqlstatus "$mysqldir"
@@ -712,6 +679,43 @@ case "$action" in
 			echo
 		done
 	fi
+}
+
+RETVAL=0
+case "$action" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+	stop
+	start
+	;;
+  try-restart)
+	condrestart 0
+	;;
+  force-reload)
+	condrestart 7
+	;;
+  init)
+	for mysqldir in $DB_CLUSTERS; do
+		mysqlinit "$mysqldir"
+	done
+	exit $?
+	;;
+  flush-logs)
+	for mysqldir in $DB_CLUSTERS; do
+	    mysqlgetconfig "$mysqldir"
+		# just if mysqld is really running
+		if /usr/bin/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" ping >/dev/null 2>&1; then
+			/usr/bin/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" flush-logs
+		fi
+	done
+	;;
+  status)
+	status
 	;;
   *)
 	msg_usage "$0 {start|stop|restart|try-restart|force-reload|init|flush-logs|status}"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/0d6ce890d283f0d40bf6a6642702f4f264b365ac