X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mysqld.conf;h=bb9b3a6dc8f46a87e68f3fc514e8db4cfdae1526;hb=2a8a1af4dfeb087d8cfff9b12c89ab8a183dc07a;hp=ec1f8596e0c074d49246dae2d5097081269af509;hpb=a423272637e74dcc8381bf26c39ea028657d2e12;p=packages%2Fmysql.git

diff --git a/mysqld.conf b/mysqld.conf
index ec1f859..bb9b3a6 100644
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -3,7 +3,6 @@
 #
 # One can use all long options that the mysqld supports.
 # Run mysqld with --help to get a whole list of available options
-# $Id$
 
 # This section must be the first!
 [mysqld]
@@ -53,25 +52,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,7 +87,32 @@ 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
+
+# https://dev.mysql.com/doc/refman/5.6/en/log-destinations.html
 # global option where logs be written
+# affects slow-query-log, general-log direcives
+# Possible values: FILE, TABLE
+# NOTE: when using table, you can switch to MyISAM, but the contents is still
+# not replicated, also mysqldump will not dump data, only create table
+# statements
+#log-output = TABLE
 log-output = FILE
 
 # mysqld error log (stderr)
@@ -109,7 +121,7 @@ log-warnings = 2
 
 # Log slow queries
 slow-query-log
-slow-query-log_file = /var/log/mysql/slow.log
+slow-query-log-file = /var/log/mysql/slow.log
 
 # Log connections and queries. It slows down MySQL so it's disabled by default
 #general-log
@@ -158,17 +170,12 @@ slow-query-log_file = /var/log/mysql/slow.log
 #max_heap_table_size=32M
 #thread_cache_size=16
 #thread_stack=65536
-# Try number of CPU's*2
-#thread_concurrency=8
+# http://www.mysqlperformanceblog.com/2012/06/04/thread_concurrency-doesnt-do-what-you-expect/
+# thread_concurrency is deprecated, removed in 5.6.1 and works on old Solaris versions < 9
 #wait_timeout=28800
 #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 +195,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
 
 #
@@ -197,7 +205,7 @@ myisam-recover
 
 # http://stackoverflow.com/questions/2646373/mysql-data-file-wont-shrink
 # http://dev.mysql.com/doc/refman/5.5/en/innodb-multiple-tablespaces.html
-#innodb_file_per_table
+innodb_file_per_table
 
 # these are actual defaults (as of 5.0.26)
 innodb_data_home_dir = @clusterdir@/mysqldb/db
@@ -220,3 +228,8 @@ innodb_log_buffer_size=1M
 [mysqladmin]
 user        = mysql_sysadmin
 password    =
+
+# used by initscript to fetch slave status
+[mysql]
+user        = mysql
+password    =