X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmysql.git;a=blobdiff_plain;f=mysqld.conf;h=ce56802380a76f5ca555f17e90cd35b6ac901ae7;hp=632ab021bc3a02f917212b7300542fffe7e3e994;hb=26438c9b3ebf9c8a472c87abdbfa71f88de60e79;hpb=5d87e23e83778b780ea870de884296569fd5b127

diff --git a/mysqld.conf b/mysqld.conf
index 632ab02..ce56802 100644
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -143,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
@@ -179,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
 #