- reverted last change - it's better to add it to mysqld.conf

Changed files:
    mysql.init -> 1.26
    mysql.sysconfig -> 1.6
    mysqld.conf -> 1.5

diff --git a/mysql.init b/mysql.init
index 8d824fbe4d83b88deaad3ea206e505eadc9fe8a4..e282640a0131f5b87a8aefd8d68a4d7b81b513d7 100644 (file)
--- a/mysql.init
+++ b/mysql.init
@@ -92,7 +92,7 @@ case "$1" in
                chmod 640 $MYSQLD_ERRLOG
 
                [ -z "$DEFAULT_SERVICE_RUN_NICE_LEVEL" ] && DEFAULT_SERVICE_RUN_NICE_LEVEL=0
-               TMPDIR=/tmp nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} /usr/sbin/mysqld --defaults-file=$MYSQLD_CONFIG $ADDITIONAL_OPTIONS >>$MYSQLD_ERRLOG 2>&1 &
+               TMPDIR=/tmp nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} /usr/sbin/mysqld --defaults-file=$MYSQLD_CONFIG >>$MYSQLD_ERRLOG 2>&1 &
                sleep 1
                deltext
                if ps -C mysqld >/dev/null 2>&1; then

diff --git a/mysql.sysconfig b/mysql.sysconfig
index af9f956d3409710279c3e4a76386b96ba479cb56..30037deb28a22ccba0c14d094aa54dd047b0ffd2 100644 (file)
--- a/mysql.sysconfig
+++ b/mysql.sysconfig
@@ -2,6 +2,3 @@
 
 # Define nice level for mysql
 SERVICE_RUN_NICE_LEVEL="+0"
-
-# Other options for MySQL:
-ADDITIONAL_OPTIONS=""

diff --git a/mysqld.conf b/mysqld.conf
index ec9bbd935dc3716bc8c6774530092e7a054ca270..97ce31fc9ff187c469bafef55de7de1c703c3da3 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -17,6 +17,9 @@ user        = mysql
 # Don't allow connections over the network by default 
 skip-networking
 
+# Emergency option. Use only if you really need this.
+#skip-grant-tables
+
 # Log connections and queries. It slows down MySQL so it's disabled by default
 #log        = /var/log/mysql/log