Resync my.cnf

git-svn-id: svn://presbrey.mit.edu/sql@181 a142d4bd-2cfb-0310-9673-cb33a7e74f58

diff --git a/etc/kitchen-sink/my.cnf b/etc/kitchen-sink/my.cnf
index 334d6bd72fa59d6feb8fd50e7d0ddbb97b77072c..e4c05bc279118363c6b89c72c2ae8628cbc89af3 100644 (file)
--- a/etc/kitchen-sink/my.cnf
+++ b/etc/kitchen-sink/my.cnf
@@ -11,8 +11,8 @@ log_slow_queries
 long_query_time=4
 max_connections=512
 max_connect_errors=0
-wait_timeout=60
-interactive_timeout=60
+wait_timeout=300
+interactive_timeout=300
 connect_timeout=10
 local_infile=0
 ft_min_word_len=3
@@ -58,8 +58,6 @@ ssl_ca=/etc/pki/tls/certs/ca.pem
 ssl_cert=/etc/pki/tls/certs/sql.pem
 ssl_key=/etc/pki/tls/private/sql.pem
 
-skip-bdb
-skip-merge
 skip-name-resolve
 
 # Disable the "data directory" option: