- keep common dirs for mysqlrouter in mysql-common, fix /var/{lib,log} dirs

[packages/mysql.git] / mysqld.conf

diff --git a/mysqld.conf b/mysqld.conf
index 09808af2c7c9bc1441e6f344ef6644fba0b38f52..0e5fbc2d4f918e3c418a5a496339b66a0261255a 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -13,9 +13,9 @@ port        = 3306
 user        = mysql
 
 # ssl options
-#ssl-ca = /etc/ssl/certs/mysql{MYSQL_MAJOR}/ca-cert.pem
-#ssl-cert = /etc/ssl/certs/mysql{MYSQL_MAJOR}/server-cert.pem
-#ssl-key = /etc/ssl/certs/mysql{MYSQL_MAJOR}/server-key.pem
+#ssl-ca = /etc/ssl/certs/mysql-@mysqlversion@/ca-cert.pem
+#ssl-cert = /etc/ssl/certs/mysql-@mysqlversion@/server-cert.pem
+#ssl-key = /etc/ssl/certs/mysql-@mysqlversion@/server-key.pem
 #ssl-cipher = DHE-RSA-AES256-SHA
 
 # Don't listen on a TCP/IP port at all. This is a security enhancement,
@@ -43,19 +43,19 @@ skip-networking
 log-output = FILE
 
 # mysqld error log (stderr)
-log-error = /var/log/mysql{MYSQL_MAJOR}/mysqld.log
+log-error = /var/log/mysql/@mysqlversion@/mysqld.log
 log-error-verbosity = 2
 
 # Log slow queries
 slow-query-log
-slow-query-log-file = /var/log/mysql{MYSQL_MAJOR}/slow.log
+slow-query-log-file = /var/log/mysql/@mysqlversion@/slow.log
 
 # Log connections and queries. It slows down MySQL so it's disabled by default
 #general-log
-#general-log-file = /var/log/mysql{MYSQL_MAJOR}/query.log
+#general-log-file = /var/log/mysql/@mysqlversion/query.log
 
 # Log all updates.
-#log-update = /var/log/mysql{MYSQL_MAJOR}/update
+#log-update = /var/log/mysql/@mysqlversion@/update
 # Log some extra information to update log
 #log-long-format