SOURCES (MYSQL_4_1): mysql.init - merge socket fix from HEAD

[glen]

Author: glen                         Date: Tue Jul 18 17:43:27 2006 GMT
Module: SOURCES                       Tag: MYSQL_4_1
---- Log message:
- merge socket fix from HEAD

---- Files affected:
SOURCES:
   mysql.init (1.85.2.2 -> 1.85.2.3) 

---- Diffs:

================================================================
Index: SOURCES/mysql.init
diff -u SOURCES/mysql.init:1.85.2.2 SOURCES/mysql.init:1.85.2.3
--- SOURCES/mysql.init:1.85.2.2	Thu Jul 13 17:11:36 2006
+++ SOURCES/mysql.init	Tue Jul 18 19:43:22 2006
@@ -639,7 +639,7 @@
 	    chmod 640 "$MYSQL_CLUSTER_DIR/mysqld.conf"
 	fi
 
-	if [ ! -e /var/lib/mysql/mysql.sock ]; then
+	if [ ! -e /var/lib/mysql/mysql.sock ] || [ -L /var/lib/mysql/mysql.sock ] && [ -z "$(readlink /var/lib/mysql/mysql.sock)" ]; then
 		sock=$(echo "$MYSQL_SOCKET" | sed -e 's,^/var/lib/mysql/,,')
 	    ln -s "$sock" /var/lib/mysql/mysql.sock
 	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mysql.init?r1=1.85.2.2&r2=1.85.2.3&f=u