Revert some earlier changes to my.cnf and mariadb.cnf.

I want to avoid that upgrades silently change important config parameters
that users have come to rely on. This could happen if users changed their
my.cnf themselves, and then an upgrade introduces mariadb.cnf which silently
overrides the settings in my.cnf. Avoid this by having mariadb.cnf mostly
empty for now, and in the future we can add just new mariadb-specific
options there that do not break existing installations.

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

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
 #