packages: mysql/mysql.init - --log-error support moved to mysqlconfig, now ...

[glen]

Author: glen                         Date: Thu Apr  8 20:34:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- --log-error support moved to mysqlconfig, now it doesn't collide with 
different clusters

---- Files affected:
packages/mysql:
   mysql.init (1.141 -> 1.142) 

---- Diffs:

================================================================
Index: packages/mysql/mysql.init
diff -u packages/mysql/mysql.init:1.141 packages/mysql/mysql.init:1.142
--- packages/mysql/mysql.init:1.141     Thu Apr  8 22:25:17 2010
+++ packages/mysql/mysql.init   Thu Apr  8 22:34:46 2010
@@ -149,7 +149,7 @@
 
 # get mysql configuration in variables
 # MYSQL_CONFIG MYSQL_CLUSTER_DIR
-# MYSQL_DATA_DIR MYSQL_USER MYSQL_PIDFILE MYSQL_SOCKET MYSQL_PORT 
MYSQL_BIND_ADDRESS MYSQL_SKIP_NETWORKING
+# MYSQL_DATA_DIR MYSQL_USER MYSQL_PIDFILE MYSQL_SOCKET MYSQL_PORT 
MYSQL_BIND_ADDRESS MYSQL_SKIP_NETWORKING MYSQL_LOG_ERROR
 #
 # arguments
 # $1 - db cluster
@@ -188,7 +188,7 @@
        fi
 
        # reset to initial state
-       MYSQL_DATA_DIR= MYSQL_USER= MYSQL_PIDFILE= MYSQL_SOCKET= MYSQL_PORT= 
MYSQL_BIND_ADDRESS= MYSQL_SKIP_NETWORKING=
+       MYSQL_DATA_DIR= MYSQL_USER= MYSQL_PIDFILE= MYSQL_SOCKET= MYSQL_PORT= 
MYSQL_BIND_ADDRESS= MYSQL_SKIP_NETWORKING= MYSQL_LOG_ERROR=
 
        eval `awk -F= '
        # skip comments and empty lines
@@ -221,10 +221,20 @@
                        printf("MYSQL_BIND_ADDRESS=%s;", $2);
                } else if ($1 == "skip-networking") {
                        printf("MYSQL_SKIP_NETWORKING=1;");
+               } else if ($1 == "log-error") {
+                       printf("MYSQL_LOG_ERROR=%s;", $2);
                }
        }
        ' $config_file`
 
+       # error log not defined in config file. add one
+       if [ -z "$MYSQL_LOG_ERROR" ]; then
+               MYSQL_LOG_ERROR=$MYSQL_ERRLOG
+       else
+               # unset, so mysqld would use value from config itself
+               unset MYSQL_LOG_ERROR
+       fi
+
        if is_yes "$MYSQL_RA_COMPAT"; then
                MYSQL_DATA_DIR_SUB=""
        else
@@ -243,7 +253,7 @@
                exit 6
        fi
 
-       if [ -z $MYSQL_USER ]; then
+       if [ -z "$MYSQL_USER" ]; then
                echo "$(nls 'MySQL user not configured properly')"'!' >&2
                nls "Edit %s and configure it." "$config_file" >&2
                exit 6
@@ -264,16 +274,13 @@
        [ -z "$DEFAULT_SERVICE_RUN_NICE_LEVEL" ] && 
DEFAULT_SERVICE_RUN_NICE_LEVEL=0
        rm -f "$MYSQL_PIDFILE"
 
-       if [ "$(grep -c ^log-error $MYSQL_CONFIG)" -lt 1 ]; then
-               # error log not defined in config file. add one
-               MYSQL_OPTIONS="$MYSQL_OPTIONS --log-error=$MYSQL_ERRLOG"
-       fi
 
        TMPDIR=/tmp nice -n 
${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} \
                /usr/bin/setsid /usr/sbin/mysqld \
                        --defaults-file=$MYSQL_CONFIG \
                        --datadir=$MYSQL_DATA_DIR \
                        --pid-file=$MYSQL_PIDFILE \
+                       ${MYSQL_LOG_ERROR:+--log-error="$MYSQL_LOG_ERROR"} \
                        $MYSQL_OPTIONS &
        pid=$!
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.init?r1=1.141&r2=1.142&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit