summaryrefslogtreecommitdiff
path: root/support-files/my-small.cnf.sh
diff options
context:
space:
mode:
authorDaniel Fischer <df@sun.com>2009-03-31 16:04:01 +0200
committerDaniel Fischer <df@sun.com>2009-03-31 16:04:01 +0200
commitaf8393a6a63bc9fd0b8126c31903975e46d34542 (patch)
treeced34788cb147af275f1635d202b713c947f3456 /support-files/my-small.cnf.sh
parenteb5ef513271a23a06aa7369175fbdbf799218446 (diff)
parentc07354b5dcddabc7a493af00acc24b9ac237638d (diff)
downloadmariadb-git-af8393a6a63bc9fd0b8126c31903975e46d34542.tar.gz
Bug#34521, removed a bunch of deprecated options from template my.cnf files.
Merged from 5.0 version of this patch: - Removed entire isamchk section. Support for ISAM tables was removed in 5.0. - Replaced key_buffer with key_buffer_size (correct spelling). - Removed skip-bdb, as BDB is no longer included in 5.0 and above. - Removed commented-out bdb_cache_size and bdb_max_lock for the same reason. - Removed commented-out innodb_log_arch_dir, deprecated in 5.0.24. - Removed myisam_max_extra_sort_file_size, deprecated in 5.0.6. - Removed log_long_format, deprecated in 4.1. - Replaced default_table_type with default-storage-engine. New in 5.1: - Replaced table_cache with table_open_cache. - Removed skip-federated, should have been in 5.0 only. - Replaced log_slow_queries with slow_query_log, deprecated in 5.1.29.
Diffstat (limited to 'support-files/my-small.cnf.sh')
-rw-r--r--support-files/my-small.cnf.sh10
1 files changed, 3 insertions, 7 deletions
diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh
index c7a995ba95a..3bfa08d0bd1 100644
--- a/support-files/my-small.cnf.sh
+++ b/support-files/my-small.cnf.sh
@@ -27,9 +27,9 @@ socket = @MYSQL_UNIX_ADDR@
port = @MYSQL_TCP_PORT@
socket = @MYSQL_UNIX_ADDR@
skip-locking
-key_buffer = 16K
+key_buffer_size = 16K
max_allowed_packet = 1M
-table_cache = 4
+table_open_cache = 4
sort_buffer_size = 64K
read_buffer_size = 256K
read_rnd_buffer_size = 256K
@@ -74,12 +74,8 @@ no-auto-rehash
# Remove the next comment character if you are not familiar with SQL
#safe-updates
-[isamchk]
-key_buffer = 8M
-sort_buffer_size = 8M
-
[myisamchk]
-key_buffer = 8M
+key_buffer_size = 8M
sort_buffer_size = 8M
[mysqlhotcopy]