- sphinx 2.2.7

[packages/mysql.git] / mysqld.conf

diff --git a/mysqld.conf b/mysqld.conf
index c4f7331dfd3099d2af088f45e118d3108d2810a3..ce56802380a76f5ca555f17e90cd35b6ac901ae7 100644 (file)
--- 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)
@@ -137,6 +143,7 @@ slow-query-log_file = /var/log/mysql/slow.log
 # Internal server variables
 #
 
+explicit_defaults_for_timestamp = true
 #back_log=5
 #connect_timeout=5
 #delayed_insert_timeout=300
@@ -173,6 +180,10 @@ slow-query-log_file = /var/log/mysql/slow.log
 # Fulltext search options
 #ft_min_word_len=2
 
+# Turn off nonstandard TIMESTAMP behaviors
+# http://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html#sysvar_explicit_defaults_for_timestamp
+explicit_defaults_for_timestamp = true
+
 #
 # MyISAM tables options
 #
@@ -199,7 +210,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