X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mysqld.conf;h=632ab021bc3a02f917212b7300542fffe7e3e994;hb=a08b7d4373117e32219a72ec068d109ef099c899;hp=9df699ed46d6226328d04af2a908c93f98f9c842;hpb=6350313fb618733598e985b127d0f65545235414;p=packages%2Fmysql.git

diff --git a/mysqld.conf b/mysqld.conf
index 9df699e..632ab02 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]
@@ -106,7 +105,14 @@ skip-networking
 # 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)
@@ -199,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
@@ -222,3 +228,8 @@ innodb_log_buffer_size=1M
 [mysqladmin]
 user        = mysql_sysadmin
 password    =
+
+# used by initscript to fetch slave status
+[mysql]
+user        = mysql
+password    =