- turn off nonstandard TIMESTAMP behaviors

diff --git a/mysqld.conf b/mysqld.conf
index 632ab021bc3a02f917212b7300542fffe7e3e994..ce56802380a76f5ca555f17e90cd35b6ac901ae7 100644 (file)
--- 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
 #