- 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, 40 insertions, 14 deletions

diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
index 50a14b0fc96..b1cf295e429 100644
--- a/support-files/my-huge.cnf.sh
+++ b/support-files/my-huge.cnf.sh
@@ -31,27 +31,53 @@ set-variable	= max_allowed_packet=1M
 set-variable	= table_cache=512
 set-variable	= sort_buffer=2M
 set-variable	= record_buffer=2M
+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
-set-variable	= myisam_sort_buffer_size=64M
+
+# 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)
-log-bin             # required for replication
-server-id	= 1 # 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
+# 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)
-#master-host     =   # MUST BE SET
-#master-user     =   # MUST BE SET
-#master-password =   # MUST BE SET
-#master-port     =   # optional--defaults to 3306
-#log-bin             # not required for slaves, but recommended
-#server-id       = 2 # 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
+#
+# 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/