summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/additions/mariadb.cnf19
-rw-r--r--debian/additions/my.cnf13
2 files changed, 13 insertions, 19 deletions
diff --git a/debian/additions/mariadb.cnf b/debian/additions/mariadb.cnf
index 12db9581469..6c2d812f0cc 100644
--- a/debian/additions/mariadb.cnf
+++ b/debian/additions/mariadb.cnf
@@ -15,22 +15,3 @@
#default-collation = utf8_general_ci
#character_set_server = utf8
#collation_server = utf8_general_ci
-#
-# * Fine Tuning
-#
-max_connections = 100
-connect_timeout = 5
-wait_timeout = 600
-sort_buffer_size = 4M
-bulk_insert_buffer_size = 16M
-tmp_table_size = 32M
-max_heap_table_size = 32M
-#
-# * MyISAM
-#
-key_buffer_size = 128M
-table_cache = 400
-myisam_sort_buffer_size = 512M
-concurrent_insert = 2
-read_buffer_size = 2M
-read_rnd_buffer_size = 1M
diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf
index ed19dcf5fc9..fd9bcf19977 100644
--- a/debian/additions/my.cnf
+++ b/debian/additions/my.cnf
@@ -48,15 +48,28 @@ bind-address = 127.0.0.1
#
# * Fine Tuning
#
+max_connections = 100
+connect_timeout = 5
+wait_timeout = 600
max_allowed_packet = 16M
thread_cache_size = 128
+sort_buffer_size = 4M
+bulk_insert_buffer_size = 16M
+tmp_table_size = 32M
+max_heap_table_size = 32M
#
# * MyISAM
#
# This replaces the startup script and checks MyISAM tables if needed
# the first time they are touched. On error, make copy and try a repair.
myisam_recover = BACKUP
+key_buffer_size = 128M
#open-files-limit = 2000
+table_cache = 400
+myisam_sort_buffer_size = 512M
+concurrent_insert = 2
+read_buffer_size = 2M
+read_rnd_buffer_size = 1M
#
# * Query Cache Configuration
#