- merge changes from HEAD

[packages/mysql.git] / mysqld.conf

diff --git a/mysqld.conf b/mysqld.conf
index 9a8dba62da4bf351742e37d25d4e9f7c74e13837..065b90e0e5edbd777af143f429a1a4c8a7f7a0c1 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -4,16 +4,19 @@
 ; $Id$
 
 ; This section must be the first!
-[mysqld] 
-datadir     = /var/lib/mysql/db
-pid-file    = /var/lib/mysql/mysql.pid
+[mysqld]
+datadir     = /var/lib/mysql/mysqldb/db
+pid-file    = /var/lib/mysql/mysqldb/mysql.pid
 port        = 3306
 socket      = /var/lib/mysql/mysql.sock
 user        = mysql
 
 ;character-set-server=latin2
 ;collation-server=latin2_general_ci
-;init-connect="SET NAMES latin2"
+;skip-character-set-client-handshake
+
+; set default charset
+;default-character-set = latin1
 
 ; Use passwords compatible with old 4.0 mysqld
 ;old-passwords
@@ -21,16 +24,54 @@ user        = mysql
 ; Don't use system locking
 ;skip-locking
 
-; Don't allow connections over the network by default 
+; Don't allow connections over the network by default
 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
 
+; replication options
+;server-id=2
+
+; skip startup of slave
+;skip-slave-start
+
+; slave setup
+;relay-log=slave-relay-bin
+;master-host=master
+;master-user=replica
+;master-port=3306
+;master-password=replica
+
+; master does not ignore them, but we do
+;replicate-ignore-db=mysql
+;replicate-ignore-db=test
+
+;replicate-rewrite-db=delfi->delfi_ro
+
+; master setup
+;log-bin
+
+; databases to be included in binlog
+;binlog-do-db=db1
+; or excluded
+;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 connections and queries. It slows down MySQL so it's disabled by default
 ;log        = /var/log/mysql/log
 
-; Log all updates. 
+; Log all updates.
 ;log-update = /var/log/mysql/update
 ; Log some extra information to update log
 ;log-long-format
@@ -67,9 +108,19 @@ skip-networking
 ;set-variable = sort_buffer_size=2M
 ;set-variable = table_cache=64
 ;set-variable = tmp_table_size=1M
+;set-variable = max_heap_table_size=32M
+;set-variable = thread_cache_size=16
 ;set-variable = thread_stack=65536
+; Try number of CPU's*2
+;set-variable = thread_concurrency=8
 ;set-variable = wait_timeout=28800
+;set-variable = query_cache_size=8M
+;set-variable = query_cache_limit=1M
 
+; replication local log
+;set-variable = max_relay_log_size=256M
+; max size of master binlog files
+;set-variable = max_binlog_size=256M
 
 
 ;
@@ -81,14 +132,15 @@ skip-networking
 
 ; Repair automatically on open if the table wasn't closed properly.
 myisam-recover
-; 
+;
 ;set-variable = myisam_sort_buffer_size=4M
 
 
 
 ;
-; InnoDB tables options (see MySQL manual) 
+; InnoDB tables options (see MySQL manual)
 ;
+;skip-innodb
 
 ;innodb_data_home_dir = /var/lib/mysql/innodb/data
 ;innodb_data_file_path = 00:10M;01:20M
@@ -113,7 +165,7 @@ myisam-recover
 ; Don't use berkeley db (saves a lot of memory)
 ;skip-bdb
 
-;bdb-home          =  /var/lib/mysql/db 
+;bdb-home          =  /var/lib/mysql/db
 ;bdb-log-dir       =  /var/lib/mysql/bdb/log
 ;bdb-tmpdir        =  /var/lib/mysql/bdb/tmp
 
@@ -121,21 +173,21 @@ myisam-recover
 ;bdb-lock-detect   =  DEFAULT
 
 ; Don't synchronously flush logs.
-;bdb-no-sync 
+;bdb-no-sync
 
 ; Don't start Berkeley DB in recover mode.
 ;bdb-no-recover
 
-; Start Berkeley DB in multi-process mode (Don't use `DB_PRIVATE' 
+; Start Berkeley DB in multi-process mode (Don't use `DB_PRIVATE'
 ; when initializing Berkeley DB
 ;bdb-shared-data
 
-;set-variable      = bdb_max_lock=1000 
+;set-variable      = bdb_max_lock=1000
 
 
 ; used for logs rotation
 [mysqladmin]
-user        = mysql_logrotate 
-password    = 
+user        = mysql_logrotate
+password    =
 
-; vim=syn=dosini
+; vim:syn=dosini