summaryrefslogtreecommitdiff
path: root/support-files/my-small.cnf.sh
diff options
context:
space:
mode:
authorDaniel Fischer <df@sun.com>2009-03-31 11:54:48 +0200
committerDaniel Fischer <df@sun.com>2009-03-31 11:54:48 +0200
commit94a7e115db8dab2efd0c9ee01b9a4f1eefd70016 (patch)
tree7cc56dd25a0f264c63ac2e8047ad9b550637237c /support-files/my-small.cnf.sh
parent8725bcd94402800ac2d87f94dfecd5a202d80497 (diff)
downloadmariadb-git-94a7e115db8dab2efd0c9ee01b9a4f1eefd70016.tar.gz
Bug#34521, removed a bunch of deprecated options from template my.cnf files:
- 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.
Diffstat (limited to 'support-files/my-small.cnf.sh')
-rw-r--r--support-files/my-small.cnf.sh12
1 files changed, 2 insertions, 10 deletions
diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh
index 24c08408b46..ed938495b73 100644
--- a/support-files/my-small.cnf.sh
+++ b/support-files/my-small.cnf.sh
@@ -27,7 +27,7 @@ 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
sort_buffer_size = 64K
@@ -51,14 +51,10 @@ server-id = 1
# Disable Federated by default
skip-federated
-# Uncomment the following if you are NOT using BDB tables
-#skip-bdb
-
# Uncomment the following if you are using InnoDB tables
#innodb_data_home_dir = @localstatedir@/
#innodb_data_file_path = ibdata1:10M:autoextend
#innodb_log_group_home_dir = @localstatedir@/
-#innodb_log_arch_dir = @localstatedir@/
# You can set .._buffer_pool_size up to 50 - 80 %
# of RAM but beware of setting memory usage too high
#innodb_buffer_pool_size = 16M
@@ -78,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]