- merge socket fix from HEAD

Changed files:
    mysql.init -> 1.85.2.3

diff --git a/mysql.init b/mysql.init
index 668160bb300a92bbfe361220510f19167792e4bf..0a8dd795a3fcb0a1a2253576820dd7fbfc2c410d 100644 (file)
--- a/mysql.init
+++ b/mysql.init
@@ -639,7 +639,7 @@ mysqlinit() {
            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