- sync options from MYSQL_5_0 branch

Changed files:
    mysqld.conf -> 1.45

diff --git a/mysqld.conf b/mysqld.conf
index 1057035d98e891d7a95940bc077679ada0d523e1..2a243a4c9d044b97f8f08d630db4fd8bf3d1e520 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -11,6 +11,12 @@ socket      = @clusterdir@/mysqldb/mysql.sock
 port        = 3306
 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
@@ -43,6 +49,10 @@ skip-networking
 
 ; slave setup
 ;relay-log=slave-relay-bin
+;master-host=master
+;master-user=replica
+;master-port=3306
+;master-password=replica
 ;report-host=db-slave.example.org
 
 ; master does not ignore them, but we do
@@ -73,8 +83,8 @@ skip-networking
 ;binlog-ignore-db=mysql
 ;binlog-ignore-db=test
 
-; Log Errors
-log-error = /var/log/mysql/error
+; mysqld error log (stderr)
+log-error = /var/log/mysql/mysqld.log
 log-warnings = 2
 
 ; Log slow queries
@@ -82,7 +92,7 @@ log-slow-queries = /var/log/mysql/slow.log
 log-output = FILE
 
 ; Log connections and queries. It slows down MySQL so it's disabled by default
-;log        = /var/log/mysql/log
+;log = /var/log/mysql/query.log
 
 ; Log all updates.
 ;log-update = /var/log/mysql/update
@@ -184,4 +194,4 @@ set-variable = innodb_log_buffer_size=1M
 user        = mysql_sysadmin
 password    =
 
-; vim:syn=dosini
+; vim:ft=dosini