--- my.cnf-4.1	2008-11-14 03:39:03.000000000 +0100
+++ my.cnf-custom	2010-01-09 20:33:38.000000000 +0100
@@ -51,24 +51,60 @@ socket 						= /var/run/mysqld/mysqld.so
 pid-file 					= /var/run/mysqld/mysqld.pid
 log-error 					= /var/log/mysql/mysqld.err
 basedir 					= /usr
-datadir 					= @DATADIR@
+datadir 					= /var/lib/mysql
 skip-locking
-key_buffer 					= 16M
-max_allowed_packet 			= 1M
-table_cache 				= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
+
 language 					= /usr/share/mysql/english
 
+##WMAPS settings
+key_buffer                      = 160M #: 32M
+max_allowed_packet              = 64M
+table_cache                     = 4096
+sort_buffer_size                = 16M
+net_buffer_length               = 8K
+read_buffer_size                = 4M
+read_rnd_buffer_size            = 64M #: 8M
+myisam_sort_buffer_size         = 128M
+#myisam_index_space_size        = 128M
+#00# 2009.03.23 enter
+#00# max_connections = 50
+#00# max_user_connections = 50
+max_connections = 20
+max_user_connections = 20
+#00#
+join_buffer_size = 32M
+thread_cache_size = 512
+interactive_timeout = 25
+wait_timeout = 60
+connect_timeout = 30
+max_connect_errors = 999999
+####tmp_table_size = 16M
+tmp_table_size = 800M
+max_heap_table_size = 800M
+thread_stack            = 128K
+# * Query Cache Configuration
+#
+query_cache_type = 1
+query_cache_min_res_unit=8K
+query_cache_limit       = 8M
+query_cache_size        = 32M
+long_query_time         = 1
+#log-slow-queries       = /var/log/mysql/slow_queries.log
+#log-queries-not-using-indexes
+#expire_logs_days       = 1
+
+# Try number of CPU's*2 for thread_concurrency
+thread_concurrency = 4
+
+concurrent_insert=2
+
+
 # security:
 # using "localhost" in connects uses sockets by default
 # skip-networking
 bind-address				= 127.0.0.1
 
-log-bin
+#log-bin
 server-id 					= 1
 
 # point the following paths to different dedicated disks
@@ -97,9 +133,9 @@ tmpdir 						= /tmp/
 # the rest of the innodb config follows:
 # don't eat too much memory, we're trying to be safe on 64Mb boxes
 # you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
+innodb_buffer_pool_size = 512M
 # this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
+innodb_additional_mem_pool_size = 20M
 #
 # i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
 # and upstream wants things to be under /var/lib/mysql/, so that's the route
@@ -112,16 +148,26 @@ innodb_additional_mem_pool_size = 2M
 innodb_data_file_path = ibdata1:10M:autoextend:max:128M
 # we keep this at around 25% of of innodb_buffer_pool_size
 # sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
+innodb_log_file_size = 128M
 # this is the default, increase it if you have very large transactions going on
 innodb_log_buffer_size = 8M
 # this is the default and won't hurt you
 # you shouldn't need to tweak it
 set-variable = innodb_log_files_in_group=2
 # see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
+##innodb_flush_log_at_trx_commit = 1
+innodb_flush_log_at_trx_commit = 2
 innodb_lock_wait_timeout = 50
 innodb_file_per_table
+innodb_flush_method=O_DIRECT
+innodb_thread_concurrency=8
+transaction-isolation=READ-COMMITTED
+
+default_storage_engine=InnoDB
+#innodb_file_per_table=1
+#innodb_file_format=barracuda
+#innodb_strict_mode=1
+
 
 [mysqldump]
 quick