- killed whitespace at eols

[packages/mysql.git] / mysqld.conf

diff --git a/mysqld.conf b/mysqld.conf
index 97ce31fc9ff187c469bafef55de7de1c703c3da3..126805563371f51e332122e2223f0a36a10f1f39 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -11,6 +11,13 @@ port        = 3306
 socket      = /var/lib/mysql/mysql.sock
 user        = mysql
 
+#character-set-server=latin2
+#collation-server=latin2_general_ci
+#init-connect="SET NAMES latin2"
+
+# Use passwords compatible with old 4.0 mysqld
+#old-passwords
+
 # Don't use system locking
 #skip-locking
 
@@ -43,11 +50,12 @@ skip-networking
 #set-variable = delayed_insert_timeout=300
 #set-variable = delayed_insert_limit=100
 #set-variable = flush_time=0
-#set-variable = join_buffer=131072
-#set-variable = key_buffer=8M
+#set-variable = join_buffer_size=131072
+#set-variable = key_buffer_size=8M
 #set-variable = long_query_time=10
 #set-variable = max_allowed_packet=1M
 #set-variable = max_connections=100
+#set-variable = max_user_connections=0
 #set-variable = max_connect_errors=10
 #set-variable = max_delayed_insert_threads=20
 #set-variable = delayed_queue_size=1000
@@ -56,7 +64,7 @@ skip-networking
 #set-variable = max_write_lock_count=4294967295
 #set-variable = net_buffer_length=16384
 #set-variable = record_buffer=131072
-#set-variable = sort_buffer=2M
+#set-variable = sort_buffer_size=2M
 #set-variable = table_cache=64
 #set-variable = tmp_table_size=1M
 #set-variable = thread_stack=65536