X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mysqld.conf;h=998d0b0b5dd1c7e189b6e9742e425b28b95e5318;hb=2e4082879c79ba6b76dcca8d8874057b9b0212db;hp=9772b5da6e5f926f9bb9048f7667429be4b477fa;hpb=c040b04c98c15a9fd7f4fe4453c1ccba246ded13;p=packages%2Fmysql.git

diff --git a/mysqld.conf b/mysqld.conf
index 9772b5d..998d0b0 100644
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -1,75 +1,217 @@
 # The MySQL server configuration file.
+# vim:ft=mycnf
+#
 # One can use all long options that the mysqld supports.
 # Run mysqld with --help to get a whole list of available options
 # $Id$
 
 # This section must be the first!
-[mysqld] 
-datadir     = /var/lib/mysql
-pid-file    = /var/lib/mysql/mysql.pid
+[mysqld]
+datadir     = @clusterdir@/mysqldb/db
+pid-file    = @clusterdir@/mysqldb/mysql.pid
+socket      = @clusterdir@/mysqldb/mysql.sock
 port        = 3306
-socket      = /var/lib/mysql/mysql.sock
 user        = mysql
 
+# ssl options
+#ssl-ca = /etc/ssl/certs/mysql/ca-cert.pem
+#ssl-cert = /etc/ssl/certs/mysql/server-cert.pem
+#ssl-key = /etc/ssl/certs/mysql/server-key.pem
+#ssl-cipher = DHE-RSA-AES256-SHA
+
+#character-set-server=latin2
+#collation-server=latin2_general_ci
+#skip-character-set-client-handshake
+
+# Use passwords compatible with old 4.0 mysqld
+#old-passwords
+
 # Don't use system locking
-#skip-locking
+skip-external-locking
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+# Default storage engine is InnoDB since 5.5.5
+# You may revert to previous behaviour by specifiying MyISAM here
+#default-storage-engine=InnoDB
 
-# Don't allow connections over the network by default 
+# Don't listen on a TCP/IP port at all. This is 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.
 skip-networking
 
+# IP address to bind to
+#bind-address=127.0.0.1
+
+# no dns
+#skip-name-resolve
+
+# Emergency option. Use only if you really need this.
+#skip-grant-tables
+
+# http://dev.mysql.com/doc/refman/5.5/en/server-options.html#option_mysqld_default-storage-engine
+#default-storage-engine=MyISAM
+
+# skip startup of slave
+#skip-slave-start
+
+# slave setup
+#relay-log=slave-relay-bin
+#report-host=db-slave.example.org
+
+# master does not ignore them, but we do
+#replicate-ignore-db=mysql
+#replicate-ignore-db=test
+
+#replicate-rewrite-db=delfi->delfi_ro
+
+# Replication Master Server (default)
+# binary logging is required for replication
+#log-bin=mysql-bin
+
+# If non-zero, binary logs will be purged after expire_logs_days days; possible
+# purges happen at startup and at binary log rotation.
+#expire-logs-days=30
+
+# Normally, a slave does not log to its own binary log any updates that are
+# received from a master server. This option tells the slave to log the updates
+# performed by its SQL thread to its own binary log. For this option to have
+# any effect, the slave must also be started with the --log-bin option to
+# enable binary logging. --log-slave-updates is used when you want to chain
+# replication servers.
+#log-slave-updates
+
+# 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=2
+
+# To set up N master servers, set the variables like this:
+# Set auto_increment_increment to N on each master.
+# Set each of the N masters to have a different auto_increment_offset, using the values 1, 2, ..., N
+#auto-increment-offset=1
+#auto-increment-increment=2
+
+# databases to be included in binlog
+#binlog-do-db=db1
+# or excluded
+#binlog-ignore-db=mysql
+#binlog-ignore-db=test
+
+# global option where logs be written
+log-output = FILE
+
+# mysqld error log (stderr)
+log-error = /var/log/mysql/mysqld.log
+log-warnings = 2
+
+# Log slow queries
+slow-query-log
+slow-query-log_file = /var/log/mysql/slow.log
+
 # Log connections and queries. It slows down MySQL so it's disabled by default
-#log        = /var/log/mysql/log
+#general-log
+#general-log-file = /var/log/mysql/query.log
 
-# Log all updates. 
+# Log all updates.
 #log-update = /var/log/mysql/update
 # Log some extra information to update log
 #log-long-format
 
-# Log all isam changes
-#log-isam    = /var/log/mysql/isamlog
-
 # Language
-#language   = polish
+#lc-messages = pl_PL
 
+# Path for temporary files. Several paths may be specified, separated by a
+# colon (:), in this case they are used in a round-robin fashion.
+#tmpdir      = /var/tmp
 
+#
 # Internal server variables
+#
+
+#back_log=5
+#connect_timeout=5
+#delayed_insert_timeout=300
+#delayed_insert_limit=100
+#flush_time=0
+#join_buffer_size=131072
+#key_buffer_size=8M
+#read_rnd_buffer_size=256K
+#read_buffer_size=132K
+#long_query_time=10
+#max_allowed_packet=1M
+#max_connections=100
+#max_user_connections=0
+#max_connect_errors=10
+#max_delayed_threads=20
+#delayed_queue_size=1000
+#max_join_size=4294967295
+#max_sort_length=1024
+#max_write_lock_count=4294967295
+#net_buffer_length=16384
+#record_buffer=131072
+#sort_buffer_size=2M
+#table_cache=64
+#tmp_table_size=1M
+#max_heap_table_size=32M
+#thread_cache_size=16
+#thread_stack=65536
+# Try number of CPU's*2
+#thread_concurrency=8
+#wait_timeout=28800
+#query_cache_size=8M
+#query_cache_limit=1M
+
+# replication local log
+#max_relay_log_size=256M
+# max size of master binlog files
+#max_binlog_size=256M
+
+# Fulltext search options
+#ft_min_word_len=2
+
+#
+# MyISAM tables options
+#
 
-# MyISAM (MySQL >= 3.23.x) options
 # Don't flush key buffers between writes for any MyISAM
-# delay-key-write-for-all-tables
-
-# repair automatically on open if the table wasn't closed properly.
-# myisam-recover
-# 
-# set-variable = myisam_sort_buffer_size=4M
-
-
-#set-variable = back_log=5
-#set-variable = connect_timeout=5
-#set-variable = delayed_insert_timeout=300
-#set-variable = delayed_insert_limit=100
-#set-variable = flush_time=0
-#set-variable = join_buffer=131072
-#set-variable = key_buffer=8M
-#set-variable = long_query_time=10
-#set-variable = max_allowed_packet=1M
-#set-variable = max_connections=100
-#set-variable = max_connect_errors=10
-#set-variable = max_delayed_insert_threads=20
-#set-variable = delayed_queue_size=1000
-#set-variable = max_join_size=4294967295
-#set-variable = max_sort_length=1024
-#set-variable = max_write_lock_count=4294967295
-#set-variable = net_buffer_length=16384
-#set-variable = record_buffer=131072
-#set-variable = sort_buffer=2M
-#set-variable = table_cache=64
-#set-variable = tmp_table_size=1M
-#set-variable = thread_stack=65536
-#set-variable = wait_timeout=28800
+# set this if you have dedicated slave server where writes aren't important
+#delay-key-write-for-all-tables
+
+# Repair automatically on open if the table wasn't closed properly.
+myisam-recover
+#
+#myisam_sort_buffer_size=4M
+
+
+
+#
+# InnoDB tables options (see MySQL manual)
+#
+#skip-innodb
+
+# http://stackoverflow.com/questions/2646373/mysql-data-file-wont-shrink
+# http://dev.mysql.com/doc/refman/5.5/en/innodb-multiple-tablespaces.html
+#innodb_file_per_table
+
+# these are actual defaults (as of 5.0.26)
+innodb_data_home_dir = @clusterdir@/mysqldb/db
+innodb_data_file_path = ibdata1:10M:autoextend
+innodb_mirrored_log_groups=1
+innodb_log_group_home_dir = @clusterdir@/mysqldb/db
+innodb_log_files_in_group=2
+innodb_log_file_size=5M
+innodb_log_buffer_size=1M
 
+#innodb_flush_log_at_trx_commit=1
+#innodb_log_arch_dir = @clusterdir@/innodb/log
+#innodb_log_archive=0
+#innodb_buffer_pool_size=80M
+#innodb_additional_mem_pool_size=10M
+#innodb_file_io_threads=4
+#innodb_lock_wait_timeout=50
 
 # used for logs rotation
 [mysqladmin]
-user        = mysql_logrotate 
-password    = 
+user        = mysql_sysadmin
+password    =