Resync my.cnf

[sql.git] / etc / kitchen-sink / my.cnf

diff --git a/etc/kitchen-sink/my.cnf b/etc/kitchen-sink/my.cnf
index 905549d34ad8752ea57b7aab35461bbcb021f509..e4c05bc279118363c6b89c72c2ae8628cbc89af3 100644 (file)
--- a/etc/kitchen-sink/my.cnf
+++ b/etc/kitchen-sink/my.cnf
@@ -1,15 +1,15 @@
 [client]
 socket=/srv/mysql/mysql.sock
-ssl-ca=/etc/pki/tls/certs/ca.pem
 
 [mysql]
 socket=/srv/mysql/mysql.sock
+ssl_ca=/etc/pki/tls/certs/ca.pem
 
 [mysqld]
 datadir=/srv/mysql
 log_slow_queries
 long_query_time=4
-max_connections=256
+max_connections=512
 max_connect_errors=0
 wait_timeout=300
 interactive_timeout=300
@@ -45,11 +45,10 @@ myisam_sort_buffer_size=64M
 
 innodb_buffer_pool_size=512M
 innodb_additional_mem_pool_size=20M
-innodb_log_file_size=256M
+innodb_log_file_size=128M
 innodb_log_buffer_size=8M
 innodb_lock_wait_timeout=50
 innodb_thread_concurrency=4
-innodb_log_group_home_dir=/srv/zebra/
 innodb_file_per_table
 
 old_passwords=1
@@ -59,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: