More MYSQL_MAJOR substitutions.

diff --git a/mysql-clusters.conf b/mysql-clusters.conf
index c61764728841f159671632f80cb7c4e8d8c1c7d9..42810ffff1f55f375486d6f6463ff3cf4e5acc93 100644 (file)
--- a/mysql-clusters.conf
+++ b/mysql-clusters.conf
@@ -7,4 +7,4 @@
 # /config/location.conf=/cluster/directory
 # If you give config name without path it defaults to /etc/mysql/
 
-mysqld.conf=/var/lib/mysql
+mysqld.conf=/var/lib/mysql{MYSQL_MAJOR}

diff --git a/mysql.init b/mysql.init
index cb0f1a237d50fca3b0a98fd97ca79cac3aeab1f0..e29db1e60bd9ee720884e458d2e294bae0af3ea6 100755 (executable)
--- a/mysql.init
+++ b/mysql.init
@@ -539,7 +539,7 @@ shell> mysql{MYSQL_MAJOR} -u mysql mysql
 mysql> show tables
 
 Try 'mysqld --help' if you have problems with paths. Setting on
-logging in $MYSQL_DATA_DIR/mysqld.conf gives you a log in /var/log/mysql/query.log that
+logging in $MYSQL_DATA_DIR/mysqld.conf gives you a log in /var/log/mysql{MYSQL_MAJOR}/query.log that
 may be helpful. The latest information about MySQL is available on the
 web at http://www.mysql.com/.