X-Git-Url: http://andersk.mit.edu/gitweb/sql.git/blobdiff_plain/3d9c319c8f9d4db1e2247adaa4eef44b8b6b0ba8..a7f56b30420769ccacc778b33ed2f153d0fa001b:/etc/kitchen-sink/my.cnf

diff --git a/etc/kitchen-sink/my.cnf b/etc/kitchen-sink/my.cnf
index 334d6bd..e4c05bc 100644
--- 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: