SOURCES: mysqld.conf - sync options from MYSQL_5_0 branch

[glen]

Author: glen                         Date: Mon Oct 27 14:36:38 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- sync options from MYSQL_5_0 branch

---- Files affected:
SOURCES:
   mysqld.conf (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: SOURCES/mysqld.conf
diff -u SOURCES/mysqld.conf:1.44 SOURCES/mysqld.conf:1.45
--- SOURCES/mysqld.conf:1.44	Wed Jul  9 15:16:53 2008
+++ SOURCES/mysqld.conf	Mon Oct 27 15:36:32 2008
@@ -11,6 +11,12 @@
 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 @@
 
 ; 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 @@
 ;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-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 @@
 user        = mysql_sysadmin
 password    =
 
-; vim:syn=dosini
+; vim:ft=dosini
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mysqld.conf?r1=1.44&r2=1.45&f=u