mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 18:20:07 +01:00
- worked around bug #235 (my-huge.cnf error) by reformatting the comments
in the sample configuration files - reworked the replication options and comments a bit - added option "skip-networking" (commented out by default) to the sample configuration files (enhancement request from bug report #234) support-files/my-huge.cnf.sh: - work around bug #235 (comments at the end of configuration options lead to errors) by reformatting the comments to be above the options instead - enhanced comments on the replication options a bit - added option "skip-networking" (commented out by default) with an appropriate comment (bug #234) support-files/my-large.cnf.sh: - work around bug #235 (comments at the end of configuration options lead to errors) by reformatting the comments to be above the options instead - enhanced comments on the replication options a bit - added option "skip-networking" (commented out by default) with an appropriate comment (bug #234) support-files/my-medium.cnf.sh: - work around bug #235 (comments at the end of configuration options lead to errors) by reformatting the comments to be above the options instead - enhanced comments on the replication options a bit - added option "skip-networking" (commented out by default) with an appropriate comment (bug #234)
This commit is contained in:
parent
0606f5bb1b
commit
d1048a22bb
3 changed files with 126 additions and 18 deletions
|
@ -31,27 +31,53 @@ set-variable = max_allowed_packet=1M
|
||||||
set-variable = table_cache=512
|
set-variable = table_cache=512
|
||||||
set-variable = sort_buffer=2M
|
set-variable = sort_buffer=2M
|
||||||
set-variable = record_buffer=2M
|
set-variable = record_buffer=2M
|
||||||
|
set-variable = myisam_sort_buffer_size=64M
|
||||||
set-variable = thread_cache=8
|
set-variable = thread_cache=8
|
||||||
# Try number of CPU's*2 for thread_concurrency
|
# Try number of CPU's*2 for thread_concurrency
|
||||||
set-variable = thread_concurrency=8
|
set-variable = thread_concurrency=8
|
||||||
set-variable = myisam_sort_buffer_size=64M
|
|
||||||
|
# Don't listen on a TCP/IP port at all. This can be a security enhancement,
|
||||||
|
# if all processes that need to connect to mysqld run on the same host.
|
||||||
|
# All interaction with mysqld must be made via Unix sockets or named pipes.
|
||||||
|
# Note that using this option without enabling named pipes on Windows
|
||||||
|
# (via the "pipe" option) will render mysqld useless!
|
||||||
|
#
|
||||||
|
#skip-networking
|
||||||
|
|
||||||
# Replication Master Server (default)
|
# Replication Master Server (default)
|
||||||
log-bin # required for replication
|
# binary logging is required for replication
|
||||||
server-id = 1 # required unique id between 1 and 2^32 - 1
|
log-bin
|
||||||
# defaults to 1 if master-host is not set
|
|
||||||
# but will not function as a master if omitted
|
# required unique id between 1 and 2^32 - 1
|
||||||
|
# defaults to 1 if master-host is not set
|
||||||
|
# but will not function as a master if omitted
|
||||||
|
server-id = 1
|
||||||
|
|
||||||
# Replication Slave Server (comment out master section to use this)
|
# Replication Slave Server (comment out master section to use this)
|
||||||
#master-host = # MUST BE SET
|
#
|
||||||
#master-user = # MUST BE SET
|
# required unique id between 2 and 2^32 - 1
|
||||||
#master-password = # MUST BE SET
|
# (and different from the master)
|
||||||
#master-port = # optional--defaults to 3306
|
# defaults to 2 if master-host is set
|
||||||
#log-bin # not required for slaves, but recommended
|
# but will not function as a slave if omitted
|
||||||
#server-id = 2 # required unique id between 2 and 2^32 - 1
|
#server-id = 2
|
||||||
# (and different from the master)
|
#
|
||||||
# defaults to 2 if master-host is set
|
# The replication master for this slave - required
|
||||||
# but will not function as a slave if omitted
|
#master-host = <hostname>
|
||||||
|
#
|
||||||
|
# The username the slave will use for authentication when connecting
|
||||||
|
# to the master - required
|
||||||
|
#master-user = <username>
|
||||||
|
#
|
||||||
|
# The password the slave will authenticate with when connecting to
|
||||||
|
# the master - required
|
||||||
|
#master-password = <password>
|
||||||
|
#
|
||||||
|
# The port the master is listening on.
|
||||||
|
# optional - defaults to 3306
|
||||||
|
#master-port = <port>
|
||||||
|
#
|
||||||
|
# binary logging - not required for slaves, but recommended
|
||||||
|
#log-bin
|
||||||
|
|
||||||
# Point the following paths to different dedicated disks
|
# Point the following paths to different dedicated disks
|
||||||
#tmpdir = /tmp/
|
#tmpdir = /tmp/
|
||||||
|
|
|
@ -35,9 +35,54 @@ set-variable = myisam_sort_buffer_size=64M
|
||||||
set-variable = thread_cache=8
|
set-variable = thread_cache=8
|
||||||
# Try number of CPU's*2 for thread_concurrency
|
# Try number of CPU's*2 for thread_concurrency
|
||||||
set-variable = thread_concurrency=8
|
set-variable = thread_concurrency=8
|
||||||
|
|
||||||
|
# Don't listen on a TCP/IP port at all. This can be a security enhancement,
|
||||||
|
# if all processes that need to connect to mysqld run on the same host.
|
||||||
|
# All interaction with mysqld must be made via Unix sockets or named pipes.
|
||||||
|
# Note that using this option without enabling named pipes on Windows
|
||||||
|
# (via the "pipe" option) will render mysqld useless!
|
||||||
|
#
|
||||||
|
#skip-networking
|
||||||
|
|
||||||
|
# Replication Master Server (default)
|
||||||
|
# binary logging is required for replication
|
||||||
log-bin
|
log-bin
|
||||||
|
|
||||||
|
# required unique id between 1 and 2^32 - 1
|
||||||
|
# defaults to 1 if master-host is not set
|
||||||
|
# but will not function as a master if omitted
|
||||||
server-id = 1
|
server-id = 1
|
||||||
|
|
||||||
|
# Replication Slave Server (comment out master section to use this)
|
||||||
|
#
|
||||||
|
# required unique id between 2 and 2^32 - 1
|
||||||
|
# (and different from the master)
|
||||||
|
# defaults to 2 if master-host is set
|
||||||
|
# but will not function as a slave if omitted
|
||||||
|
#server-id = 2
|
||||||
|
#
|
||||||
|
# The replication master for this slave - required
|
||||||
|
#master-host = <hostname>
|
||||||
|
#
|
||||||
|
# The username the slave will use for authentication when connecting
|
||||||
|
# to the master - required
|
||||||
|
#master-user = <username>
|
||||||
|
#
|
||||||
|
# The password the slave will authenticate with when connecting to
|
||||||
|
# the master - required
|
||||||
|
#master-password = <password>
|
||||||
|
#
|
||||||
|
# The port the master is listening on.
|
||||||
|
# optional - defaults to 3306
|
||||||
|
#master-port = <port>
|
||||||
|
#
|
||||||
|
# binary logging - not required for slaves, but recommended
|
||||||
|
#log-bin
|
||||||
|
|
||||||
|
# Point the following paths to different dedicated disks
|
||||||
|
#tmpdir = /tmp/
|
||||||
|
#log-update = /path-to-dedicated-directory/hostname
|
||||||
|
|
||||||
# Uncomment the following if you are using BDB tables
|
# Uncomment the following if you are using BDB tables
|
||||||
#set-variable = bdb_cache_size=64M
|
#set-variable = bdb_cache_size=64M
|
||||||
#set-variable = bdb_max_lock=100000
|
#set-variable = bdb_max_lock=100000
|
||||||
|
@ -57,10 +102,6 @@ server-id = 1
|
||||||
#innodb_flush_log_at_trx_commit=1
|
#innodb_flush_log_at_trx_commit=1
|
||||||
#set-variable = innodb_lock_wait_timeout=50
|
#set-variable = innodb_lock_wait_timeout=50
|
||||||
|
|
||||||
# Point the following paths to different dedicated disks
|
|
||||||
#tmpdir = /tmp/
|
|
||||||
#log-update = /path-to-dedicated-directory/hostname
|
|
||||||
|
|
||||||
[mysqldump]
|
[mysqldump]
|
||||||
quick
|
quick
|
||||||
set-variable = max_allowed_packet=16M
|
set-variable = max_allowed_packet=16M
|
||||||
|
|
|
@ -33,9 +33,50 @@ set-variable = table_cache=64
|
||||||
set-variable = sort_buffer=512K
|
set-variable = sort_buffer=512K
|
||||||
set-variable = net_buffer_length=8K
|
set-variable = net_buffer_length=8K
|
||||||
set-variable = myisam_sort_buffer_size=8M
|
set-variable = myisam_sort_buffer_size=8M
|
||||||
|
|
||||||
|
# Don't listen on a TCP/IP port at all. This can be a security enhancement,
|
||||||
|
# if all processes that need to connect to mysqld run on the same host.
|
||||||
|
# All interaction with mysqld must be made via Unix sockets or named pipes.
|
||||||
|
# Note that using this option without enabling named pipes on Windows
|
||||||
|
# (via the "pipe" option) will render mysqld useless!
|
||||||
|
#
|
||||||
|
#skip-networking
|
||||||
|
|
||||||
|
# Replication Master Server (default)
|
||||||
|
# binary logging is required for replication
|
||||||
log-bin
|
log-bin
|
||||||
|
|
||||||
|
# required unique id between 1 and 2^32 - 1
|
||||||
|
# defaults to 1 if master-host is not set
|
||||||
|
# but will not function as a master if omitted
|
||||||
server-id = 1
|
server-id = 1
|
||||||
|
|
||||||
|
# Replication Slave Server (comment out master section to use this)
|
||||||
|
#
|
||||||
|
# required unique id between 2 and 2^32 - 1
|
||||||
|
# (and different from the master)
|
||||||
|
# defaults to 2 if master-host is set
|
||||||
|
# but will not function as a slave if omitted
|
||||||
|
#server-id = 2
|
||||||
|
#
|
||||||
|
# The replication master for this slave - required
|
||||||
|
#master-host = <hostname>
|
||||||
|
#
|
||||||
|
# The username the slave will use for authentication when connecting
|
||||||
|
# to the master - required
|
||||||
|
#master-user = <username>
|
||||||
|
#
|
||||||
|
# The password the slave will authenticate with when connecting to
|
||||||
|
# the master - required
|
||||||
|
#master-password = <password>
|
||||||
|
#
|
||||||
|
# The port the master is listening on.
|
||||||
|
# optional - defaults to 3306
|
||||||
|
#master-port = <port>
|
||||||
|
#
|
||||||
|
# binary logging - not required for slaves, but recommended
|
||||||
|
#log-bin
|
||||||
|
|
||||||
# Point the following paths to different dedicated disks
|
# Point the following paths to different dedicated disks
|
||||||
#tmpdir = /tmp/
|
#tmpdir = /tmp/
|
||||||
#log-update = /path-to-dedicated-directory/hostname
|
#log-update = /path-to-dedicated-directory/hostname
|
||||||
|
|
Loading…
Add table
Reference in a new issue