- use @clusterdir@ placeholder

[packages/mysql.git] / mysqld.conf

diff --git a/mysqld.conf b/mysqld.conf
index 3a9c4f91916e3e55c6aa1bbc9dd2aad5397f3b6a..1dd98b9469b70d262091b186fd0b74343f50fa34 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -5,10 +5,10 @@
 
 ; This section must be the first!
 [mysqld]
-datadir     = /var/lib/mysql/mysqldb/db
-pid-file    = /var/lib/mysql/mysqldb/mysql.pid
+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
 
 ;character-set-server=latin2
@@ -22,9 +22,11 @@ user        = mysql
 ;old-passwords
 
 ; Don't use system locking
-;skip-locking
+skip-locking
 
-; 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
@@ -36,9 +38,6 @@ skip-networking
 ; Emergency option. Use only if you really need this.
 ;skip-grant-tables
 
-; replication options
-;server-id=2
-
 ; skip startup of slave
 ;skip-slave-start
 
@@ -55,8 +54,21 @@ skip-networking
 
 ;replicate-rewrite-db=delfi->delfi_ro
 
-; master setup
-;log-bin=binlog
+; Replication Master Server (default)
+; binary logging is required for replication
+;log-bin=mysql-bin
+
+; 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
 
 ; databases to be included in binlog
 ;binlog-do-db=db1
@@ -64,9 +76,8 @@ skip-networking
 ;binlog-ignore-db=mysql
 ;binlog-ignore-db=test
 
-; Don't flush key buffers between writes for any MyISAM
-; set this if you have dedicated slave server where writes aren't important
-;delay-key-write-for-all-tables
+; Log slow queries
+;log-slow-queries = /var/log/mysql/slow.log
 
 ; Log connections and queries. It slows down MySQL so it's disabled by default
 ;log        = /var/log/mysql/log
@@ -79,6 +90,10 @@ skip-networking
 ; Language
 ;language   = polish
 
+; 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
 ;
@@ -125,6 +140,7 @@ skip-networking
 ;
 
 ; Don't flush key buffers between writes for any MyISAM
+; 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.
@@ -139,16 +155,17 @@ myisam-recover
 ;
 ;skip-innodb
 
-;innodb_data_home_dir = /var/lib/mysql/innodb/data
-;innodb_data_file_path = 00:10M;01:20M
-;set-variable = innodb_mirrored_log_groups=1
-;innodb_log_group_home_dir = /var/lib/mysql/innodb/log
-;set-variable = innodb_log_files_in_group=3
-;set-variable = innodb_log_file_size=30M
-;set-variable = innodb_log_buffer_size=8M
+; these are actual defaults (as of 5.0.26)
+innodb_data_home_dir = @clusterdir@/mysqldb/db
+innodb_data_file_path = ibdata1:10M:autoextend
+set-variable = innodb_mirrored_log_groups=1
+innodb_log_group_home_dir = @clusterdir@/mysqldb/db
+set-variable = innodb_log_files_in_group=2
+set-variable = innodb_log_file_size=5M
+set-variable = innodb_log_buffer_size=1M
 
 ;innodb_flush_log_at_trx_commit=1
-;innodb_log_arch_dir = /var/lib/mysql/innodb/log
+;innodb_log_arch_dir = @clusterdir@/innodb/log
 ;innodb_log_archive=0
 ;set-variable = innodb_buffer_pool_size=80M
 ;set-variable = innodb_additional_mem_pool_size=10M
@@ -162,9 +179,9 @@ myisam-recover
 ; Don't use berkeley db (saves a lot of memory)
 ;skip-bdb
 
-;bdb-home          =  /var/lib/mysql/db
-;bdb-log-dir       =  /var/lib/mysql/bdb/log
-;bdb-tmpdir        =  /var/lib/mysql/bdb/tmp
+;bdb-home          =  @clusterdir@/db
+;bdb-log-dir       =  @clusterdir@/bdb/log
+;bdb-tmpdir        =  @clusterdir@/bdb/tmp
 
 
 ;bdb-lock-detect   =  DEFAULT