diff options
| -rw-r--r-- | support-files/my-huge.cnf.sh | 15 | ||||
| -rw-r--r-- | support-files/my-innodb-heavy-4G.cnf.sh | 31 | ||||
| -rw-r--r-- | support-files/my-large.cnf.sh | 15 | ||||
| -rw-r--r-- | support-files/my-medium.cnf.sh | 15 | ||||
| -rw-r--r-- | support-files/my-small.cnf.sh | 12 |
5 files changed, 11 insertions, 77 deletions
diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index e4747ac4564..75605c28340 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -26,7 +26,7 @@ socket = @MYSQL_UNIX_ADDR@ port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ skip-locking -key_buffer = 384M +key_buffer_size = 384M max_allowed_packet = 1M table_cache = 512 sort_buffer_size = 2M @@ -117,15 +117,10 @@ server-id = 1 #tmpdir = /tmp/ #log-update = /path-to-dedicated-directory/hostname -# Uncomment the following if you are using BDB tables -#bdb_cache_size = 384M -#bdb_max_lock = 100000 - # Uncomment the following if you are using InnoDB tables #innodb_data_home_dir = @localstatedir@/ #innodb_data_file_path = ibdata1:2000M;ibdata2: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 = 384M @@ -145,14 +140,8 @@ no-auto-rehash # Remove the next comment character if you are not familiar with SQL #safe-updates -[isamchk] -key_buffer = 256M -sort_buffer_size = 256M -read_buffer = 2M -write_buffer = 2M - [myisamchk] -key_buffer = 256M +key_buffer_size = 256M sort_buffer_size = 256M read_buffer = 2M write_buffer = 2M diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh index cda11d661bc..58ad16eafc2 100644 --- a/support-files/my-innodb-heavy-4G.cnf.sh +++ b/support-files/my-innodb-heavy-4G.cnf.sh @@ -167,7 +167,7 @@ ft_min_word_len = 4 # Table type which is used by default when creating new tables, if not # specified differently during the CREATE TABLE statement. -default_table_type = MYISAM +default-storage-engine = MYISAM # Thread stack size to use. This amount of memory is always reserved at # connection time. MySQL itself usually needs no more than 64K of @@ -208,7 +208,7 @@ log-bin=mysql-bin # Log slow queries. Slow queries are queries which take more than the # amount of time defined in "long_query_time" or which do not use -# indexes well, if log_long_format is enabled. It is normally good idea +# indexes well, if log_short_format is not enabled. It is normally good idea # to have this turned on if you frequently add new queries to the # system. log_slow_queries @@ -219,11 +219,6 @@ log_slow_queries # currently measures time with second accuracy only). long_query_time = 2 -# Log more information in the slow query log. Normally it is good to -# have this turned on. This will enable logging of queries that are not -# using indexes in addition to long running queries. -log_long_format - # The directory used by MySQL for storing temporary files. For example, # it is used to perform disk based large sorts, as well as for internal # and explicit temporary tables. It might be good to put it on a @@ -342,12 +337,6 @@ myisam_sort_buffer_size = 128M # through the key cache (which is slower). myisam_max_sort_file_size = 10G -# If the temporary file used for fast index creation would be bigger -# than using the key cache by the amount specified here, then prefer the -# key cache method. This is mainly used to force long character keys in -# large tables to use the slower key cache method to create the index. -myisam_max_extra_sort_file_size = 10G - # If a table has more than one index, MyISAM can use more than one # thread to repair them by sorting in parallel. This makes sense if you # have multiple CPUs and plenty of memory. @@ -360,14 +349,6 @@ myisam_recover # Disable Federated by default skip-federated -# *** BDB Specific options *** - -# Use this option if you run a MySQL server with BDB support enabled but -# you do not plan to use it. This will save memory and may speed up some -# things. -skip-bdb - - # *** INNODB Specific options *** # Use this option if you have a MySQL server with InnoDB support enabled @@ -490,14 +471,8 @@ no-auto-rehash # Only allow UPDATEs and DELETEs that use keys. #safe-updates -[isamchk] -key_buffer = 512M -sort_buffer_size = 512M -read_buffer = 8M -write_buffer = 8M - [myisamchk] -key_buffer = 512M +key_buffer_size = 512M sort_buffer_size = 512M read_buffer = 8M write_buffer = 8M diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh index 981b13731e4..209dc3afe4a 100644 --- a/support-files/my-large.cnf.sh +++ b/support-files/my-large.cnf.sh @@ -26,7 +26,7 @@ socket = @MYSQL_UNIX_ADDR@ port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ skip-locking -key_buffer = 256M +key_buffer_size = 256M max_allowed_packet = 1M table_cache = 256 sort_buffer_size = 1M @@ -117,15 +117,10 @@ server-id = 1 #tmpdir = /tmp/ #log-update = /path-to-dedicated-directory/hostname -# Uncomment the following if you are using BDB tables -#bdb_cache_size = 64M -#bdb_max_lock = 100000 - # 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 = 256M @@ -145,14 +140,8 @@ no-auto-rehash # Remove the next comment character if you are not familiar with SQL #safe-updates -[isamchk] -key_buffer = 128M -sort_buffer_size = 128M -read_buffer = 2M -write_buffer = 2M - [myisamchk] -key_buffer = 128M +key_buffer_size = 128M sort_buffer_size = 128M read_buffer = 2M write_buffer = 2M diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh index c3135ea2c2b..e299add99d7 100644 --- a/support-files/my-medium.cnf.sh +++ b/support-files/my-medium.cnf.sh @@ -27,7 +27,7 @@ socket = @MYSQL_UNIX_ADDR@ port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ skip-locking -key_buffer = 16M +key_buffer_size = 16M max_allowed_packet = 1M table_cache = 64 sort_buffer_size = 512K @@ -115,15 +115,10 @@ server-id = 1 #tmpdir = /tmp/ #log-update = /path-to-dedicated-directory/hostname -# Uncomment the following if you are using BDB tables -#bdb_cache_size = 4M -#bdb_max_lock = 10000 - # 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 @@ -143,14 +138,8 @@ no-auto-rehash # Remove the next comment character if you are not familiar with SQL #safe-updates -[isamchk] -key_buffer = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - [myisamchk] -key_buffer = 20M +key_buffer_size = 20M sort_buffer_size = 20M read_buffer = 2M write_buffer = 2M 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] |