diff --git a/config/mycnf/default-fast.cnf b/config/mycnf/default-fast.cnf index 0046bad32a2..bb7edf6720b 100644 --- a/config/mycnf/default-fast.cnf +++ b/config/mycnf/default-fast.cnf @@ -1,41 +1,27 @@ # basic config parameters for all db instances in the grid sql_mode = STRICT_TRANS_TABLES -back_log = 50 binlog_format = statement character_set_server = utf8 collation_server = utf8_general_ci connect_timeout = 30 datadir = {{.DataDir}} -default-storage-engine = innodb expire_logs_days = 3 -innodb_autoextend_increment = 1 innodb_buffer_pool_size = 64M -innodb_data_file_path = ibdata1:10M:autoextend innodb_data_home_dir = {{.InnodbDataHomeDir}} -innodb_file_per_table innodb_flush_log_at_trx_commit = 2 -innodb_flush_method = O_DIRECT innodb_lock_wait_timeout = 20 innodb_log_buffer_size = 1M innodb_log_file_size = 4M -innodb_log_files_in_group = 2 innodb_log_group_home_dir = {{.InnodbLogGroupHomeDir}} -innodb_max_dirty_pages_pct = 75 -innodb_thread_concurrency = 2 key_buffer_size = 2M log-error = {{.ErrorLogPath}} long_query_time = 2 -max_allowed_packet = 16M -max_connections = 200 -net_write_timeout = 60 pid-file = {{.PidFile}} port = {{.MysqlPort}} # all db instances should start in read-only mode - once the db is started and # fully functional, we'll push it into read-write mode read-only -read_buffer_size = 1M -read_rnd_buffer_size = 1M server-id = {{.ServerID}} skip-name-resolve # we now need networking for replication. this is a tombstone to simpler times. @@ -49,9 +35,4 @@ slave_load_tmpdir = {{.SlaveLoadTmpDir}} slow-query-log slow-query-log-file = {{.SlowLogPath}} socket = {{.SocketFile}} -sort_buffer_size = 2M -table_open_cache = 2048 -thread_cache_size = 200 tmpdir = {{.TmpDir}} -tmp_table_size = 32M -transaction-isolation = REPEATABLE-READ diff --git a/config/mycnf/default.cnf b/config/mycnf/default.cnf index cb6711d3fa7..61f767a8032 100644 --- a/config/mycnf/default.cnf +++ b/config/mycnf/default.cnf @@ -1,41 +1,26 @@ # basic config parameters for all db instances in the grid sql_mode = STRICT_TRANS_TABLES -back_log = 50 binlog_format = statement character_set_server = utf8 collation_server = utf8_general_ci connect_timeout = 30 datadir = {{.DataDir}} -default-storage-engine = innodb expire_logs_days = 3 -innodb_autoextend_increment = 64 innodb_buffer_pool_size = 32M -innodb_data_file_path = ibdata1:10M:autoextend innodb_data_home_dir = {{.InnodbDataHomeDir}} -innodb_file_per_table innodb_flush_log_at_trx_commit = 2 -innodb_flush_method = O_DIRECT innodb_lock_wait_timeout = 20 -innodb_log_buffer_size = 8M -innodb_log_file_size = 64M -innodb_log_files_in_group = 2 innodb_log_group_home_dir = {{.InnodbLogGroupHomeDir}} -innodb_max_dirty_pages_pct = 75 -innodb_thread_concurrency = 20 -key_buffer_size = 32M log-error = {{.ErrorLogPath}} long_query_time = 2 max_allowed_packet = 64M max_connections = 500 -net_write_timeout = 60 pid-file = {{.PidFile}} port = {{.MysqlPort}} # all db instances should start in read-only mode - once the db is started and # fully functional, we'll push it into read-write mode read-only -read_buffer_size = 8M -read_rnd_buffer_size = 8M server-id = {{.ServerID}} skip-name-resolve # all db instances should skip the slave startup - that way we can do any @@ -47,9 +32,4 @@ slave_load_tmpdir = {{.SlaveLoadTmpDir}} slow-query-log slow-query-log-file = {{.SlowLogPath}} socket = {{.SocketFile}} -sort_buffer_size = 2M -table_open_cache = 2048 -thread_cache_size = 200 tmpdir = {{.TmpDir}} -tmp_table_size = 32M -transaction-isolation = REPEATABLE-READ