- worked around bug #235 (my-huge.cnf error) by reformatting the comments

   in the sample configuration files
 - reworked the replication options and comments a bit
 - added option "skip-networking" (commented out by default) to the
   sample configuration files (enhancement request from bug report #234)

1 files changed, 45 insertions, 4 deletions

diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
index 3c388d611d8..861c2d59fb0 100644
--- a/support-files/my-large.cnf.sh
+++ b/support-files/my-large.cnf.sh
@@ -35,9 +35,54 @@ set-variable	= myisam_sort_buffer_size=64M
 set-variable	= thread_cache=8
 # Try number of CPU's*2 for thread_concurrency
 set-variable	= thread_concurrency=8
+
+# Don't listen on a TCP/IP port at all. This can be 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 or named pipes.
+# Note that using this option without enabling named pipes on Windows
+# (via the "pipe" option) will render mysqld useless!
+# 
+#skip-networking
+
+# Replication Master Server (default)
+# binary logging is required for replication
 log-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	= 1
 
+# Replication Slave Server (comment out master section to use this)
+#
+# required unique id between 2 and 2^32 - 1
+# (and different from the master)
+# defaults to 2 if master-host is set
+# but will not function as a slave if omitted
+#server-id       = 2
+#
+# The replication master for this slave - required
+#master-host     =   <hostname>
+#
+# The username the slave will use for authentication when connecting
+# to the master - required
+#master-user     =   <username>
+#
+# The password the slave will authenticate with when connecting to
+# the master - required
+#master-password =   <password>
+#
+# The port the master is listening on.
+# optional - defaults to 3306
+#master-port     =  <port>
+#
+# binary logging - not required for slaves, but recommended
+#log-bin
+
+# Point the following paths to different dedicated disks
+#tmpdir		= /tmp/		
+#log-update 	= /path-to-dedicated-directory/hostname
+
 # Uncomment the following if you are using BDB tables
 #set-variable	= bdb_cache_size=64M
 #set-variable	= bdb_max_lock=100000
@@ -57,10 +102,6 @@ server-id	= 1
 #innodb_flush_log_at_trx_commit=1
 #set-variable = innodb_lock_wait_timeout=50
 
-# Point the following paths to different dedicated disks
-#tmpdir		= /tmp/		
-#log-update 	= /path-to-dedicated-directory/hostname
-
 [mysqldump]
 quick
 set-variable	= max_allowed_packet=16M