SOURCES: mysqld.conf - merged comments from official config

[glen]

Author: glen                         Date: Thu Sep 28 21:52:36 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged comments from official config

---- Files affected:
SOURCES:
   mysqld.conf (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SOURCES/mysqld.conf
diff -u SOURCES/mysqld.conf:1.27 SOURCES/mysqld.conf:1.28
--- SOURCES/mysqld.conf:1.27	Thu Sep 28 23:29:34 2006
+++ SOURCES/mysqld.conf	Thu Sep 28 23:52:31 2006
@@ -24,7 +24,9 @@
 ; Don't use system locking
 skip-locking
 
-; Don't allow connections over the network by default
+; Don't listen on a TCP/IP port at all. This is a security enhancement,
+; if all processes that need to connect to mysqld run on the same host.
+; All interaction with mysqld must be made via Unix sockets.
 skip-networking
 
 ; IP address to bind to
@@ -36,9 +38,6 @@
 ; Emergency option. Use only if you really need this.
 ;skip-grant-tables
 
-; replication options
-;server-id=2
-
 ; skip startup of slave
 ;skip-slave-start
 
@@ -55,8 +54,13 @@
 
 ;replicate-rewrite-db=delfi->delfi_ro
 
-; master setup
-;log-bin=binlog
+; Replication Master Server (default)
+; binary logging is required for replication
+;log-bin=mysql-bin
+
+; required unique id between 1 and 2^32 - 1
+; defaults to 1 if master-host is not set but will not function as a master if omitted
+;server-id=2
 
 ; databases to be included in binlog
 ;binlog-do-db=db1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mysqld.conf?r1=1.27&r2=1.28&f=u