- [Warning] /usr/sbin/mysqld: Option '--set-variable' is deprecated. Use --variable...

  5.0 supports it as well.

Changed files:
    mysqld.conf -> 1.34.2.12

diff --git a/mysqld.conf b/mysqld.conf
index 256fe365fae9822169d375d838272ac399faa30b..155104d69ab6f96647b3290960f56cb538859424 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -121,43 +121,43 @@ log-slow-queries = /var/log/mysql/slow.log
 # Internal server variables
 #
 
-#set-variable = back_log=5
-#set-variable = connect_timeout=5
-#set-variable = delayed_insert_timeout=300
-#set-variable = delayed_insert_limit=100
-#set-variable = flush_time=0
-#set-variable = join_buffer_size=131072
-#set-variable = key_buffer_size=8M
-#set-variable = read_rnd_buffer_size=256K
-#set-variable = read_buffer_size=132K
-#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
-#set-variable = max_join_size=4294967295
-#set-variable = max_sort_length=1024
-#set-variable = max_write_lock_count=4294967295
-#set-variable = net_buffer_length=16384
-#set-variable = record_buffer=131072
-#set-variable = sort_buffer_size=2M
-#set-variable = table_cache=64
-#set-variable = tmp_table_size=1M
-#set-variable = max_heap_table_size=32M
-#set-variable = thread_cache_size=16
-#set-variable = thread_stack=65536
+#back_log=5
+#connect_timeout=5
+#delayed_insert_timeout=300
+#delayed_insert_limit=100
+#flush_time=0
+#join_buffer_size=131072
+#key_buffer_size=8M
+#read_rnd_buffer_size=256K
+#read_buffer_size=132K
+#long_query_time=10
+#max_allowed_packet=1M
+#max_connections=100
+#max_user_connections=0
+#max_connect_errors=10
+#max_delayed_insert_threads=20
+#delayed_queue_size=1000
+#max_join_size=4294967295
+#max_sort_length=1024
+#max_write_lock_count=4294967295
+#net_buffer_length=16384
+#record_buffer=131072
+#sort_buffer_size=2M
+#table_cache=64
+#tmp_table_size=1M
+#max_heap_table_size=32M
+#thread_cache_size=16
+#thread_stack=65536
 # Try number of CPU's*2
-#set-variable = thread_concurrency=8
-#set-variable = wait_timeout=28800
-#set-variable = query_cache_size=8M
-#set-variable = query_cache_limit=1M
+#thread_concurrency=8
+#wait_timeout=28800
+#query_cache_size=8M
+#query_cache_limit=1M
 
 # replication local log
-#set-variable = max_relay_log_size=256M
+#max_relay_log_size=256M
 # max size of master binlog files
-#set-variable = max_binlog_size=256M
+#max_binlog_size=256M
 
 # Fulltext search options
 #ft_min_word_len=2
@@ -173,7 +173,7 @@ log-slow-queries = /var/log/mysql/slow.log
 # Repair automatically on open if the table wasn't closed properly.
 myisam-recover
 #
-#set-variable = myisam_sort_buffer_size=4M
+#myisam_sort_buffer_size=4M
 
 
 
@@ -185,19 +185,19 @@ myisam-recover
 # these are actual defaults (as of 5.0.26)
 innodb_data_home_dir = @clusterdir@/mysqldb/db
 innodb_data_file_path = ibdata1:10M:autoextend
-set-variable = innodb_mirrored_log_groups=1
+innodb_mirrored_log_groups=1
 innodb_log_group_home_dir = @clusterdir@/mysqldb/db
-set-variable = innodb_log_files_in_group=2
-set-variable = innodb_log_file_size=5M
-set-variable = innodb_log_buffer_size=1M
+innodb_log_files_in_group=2
+innodb_log_file_size=5M
+innodb_log_buffer_size=1M
 
 #innodb_flush_log_at_trx_commit=1
 #innodb_log_arch_dir = @clusterdir@/innodb/log
 #innodb_log_archive=0
-#set-variable = innodb_buffer_pool_size=80M
-#set-variable = innodb_additional_mem_pool_size=10M
-#set-variable = innodb_file_io_threads=4
-#set-variable = innodb_lock_wait_timeout=50
+#innodb_buffer_pool_size=80M
+#innodb_additional_mem_pool_size=10M
+#innodb_file_io_threads=4
+#innodb_lock_wait_timeout=50
 
 
 #