- up to 5.5.33; link patch looks unneded (builds fine without and with systemtap...

[packages/mysql.git] / mysqld.conf

diff --git a/mysqld.conf b/mysqld.conf
index ec1f8596e0c074d49246dae2d5097081269af509..c4f7331dfd3099d2af088f45e118d3108d2810a3 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -53,25 +53,13 @@ skip-networking
 # http://dev.mysql.com/doc/refman/5.5/en/server-options.html#option_mysqld_default-storage-engine
 #default-storage-engine=MyISAM
 
-# skip startup of slave
-#skip-slave-start
-
-# slave setup
-#relay-log=slave-relay-bin
-#report-host=db-slave.example.org
-
-# master does not ignore them, but we do
-#replicate-ignore-db=mysql
-#replicate-ignore-db=test
-#replicate-ignore-table=db1.tbl1
-#replicate-ignore-table=db2.tbl2
-
-#replicate-rewrite-db=delfi->delfi_ro
-
 # Replication Master Server (default)
 # binary logging is required for replication
 #log-bin=mysql-bin
 
+# max size of master binlog files
+#max_binlog_size=256M
+
 # If non-zero, binary logs will be purged after expire_logs_days days; possible
 # purges happen at startup and at binary log rotation.
 #expire-logs-days=30
@@ -100,6 +88,24 @@ skip-networking
 #binlog-ignore-db=mysql
 #binlog-ignore-db=test
 
+# slave setup
+#relay-log=slave-relay-bin
+#report-host=db-slave.example.org
+
+# skip startup of slave
+#skip-slave-start
+
+# master does not ignore them, but we do
+#replicate-ignore-db=mysql
+#replicate-ignore-db=test
+#replicate-ignore-table=db1.tbl1
+#replicate-ignore-table=db2.tbl2
+
+#replicate-rewrite-db=delfi->delfi_ro
+
+# replication local log
+#max_relay_log_size=256M
+
 # global option where logs be written
 log-output = FILE
 
@@ -164,11 +170,6 @@ slow-query-log_file = /var/log/mysql/slow.log
 #query_cache_size=8M
 #query_cache_limit=1M
 
-# replication local log
-#max_relay_log_size=256M
-# max size of master binlog files
-#max_binlog_size=256M
-
 # Fulltext search options
 #ft_min_word_len=2
 
@@ -188,6 +189,7 @@ myisam-recover
 
 # To completely disable InnoDB, use this option
 # this makes all innodb options being unknown options (including skip-innodb)
+# @deprecated
 #ignore-builtin-innodb
 
 #
@@ -220,3 +222,8 @@ innodb_log_buffer_size=1M
 [mysqladmin]
 user        = mysql_sysadmin
 password    =
+
+# used by initscript to fetch slave status
+[mysql]
+user        = mysql
+password    =