SOURCES: mysql.init - bugfix: no hardcode, show orphaned mysqld only if ful...

[glen]

Author: glen                         Date: Thu Aug 14 09:58:13 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- bugfix: no hardcode, show orphaned mysqld only if full status asked

---- Files affected:
SOURCES:
   mysql.init (1.124 -> 1.125) 

---- Diffs:

================================================================
Index: SOURCES/mysql.init
diff -u SOURCES/mysql.init:1.124 SOURCES/mysql.init:1.125
--- SOURCES/mysql.init:1.124	Thu Aug 14 10:58:42 2008
+++ SOURCES/mysql.init	Thu Aug 14 11:58:06 2008
@@ -539,11 +539,12 @@
 			running="$running $pid"
 		fi
 	done
-	if [ "$running" ]; then
+
+	if [ $# -gt 1 -a "$running" ]; then
 		nls "Warning: MySQL Daemon processes not under clusters.conf control:"
 		# see if we can display their status
 		for pid in $running; do
-			datadir=$(cat /proc/14165/cmdline | tr '\0' '\n' | fgrep -- --datadir=)
+			datadir=$(cat /proc/$pid/cmdline | tr '\0' '\n' | fgrep -- --datadir=)
 			datadir=${datadir#--datadir=} # strip --datadir
 			mysqldir=${datadir%/mysqldb/db} # strip /mysqldb/db
 			mysqlstatus "$mysqldir"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mysql.init?r1=1.124&r2=1.125&f=u