move status action to status function

[packages/mysql.git] / mysqld.conf

diff --git a/mysqld.conf b/mysqld.conf
index 88899c91b9fa83ee3cc313a91adab173bb3d50a0..8fb97f460d71a324c87d00b8310314f666520cbc 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -14,9 +14,9 @@ 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-ca = /etc/certs/mysql/ca-cert.pem
+#ssl-cert = /etc/certs/mysql/server-cert.pem
+#ssl-key = /etc/certs/mysql/server-key.pem
 #ssl-cipher = DHE-RSA-AES256-SHA
 
 #character-set-server=latin2
@@ -185,6 +185,10 @@ myisam-recover
 #
 #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
@@ -233,3 +237,8 @@ innodb_log_buffer_size=1M
 [mysqladmin]
 user        = mysql_sysadmin
 password    =
+
+# used by initscript to fetch slave status
+[mysql]
+user        = mysql
+password    =