- use @clusterdir@ placeholder

Changed files:
    mysql.init -> 1.103
    mysqld.conf -> 1.33

diff --git a/mysql.init b/mysql.init
index 93986b298c34798379ff18082961f07d0ebe39f4..73c0594235686f717b0d6979a47559b715f4e8dc 100644 (file)
--- a/mysql.init
+++ b/mysql.init
@@ -332,7 +332,6 @@ mysqlinit() {
        busy
        TMP=/tmp TMPDIR=/tmp
 
-
        # Install this in the user table, too
        hostname="`hostname --fqdn 2> /dev/null | tr -d '[:space:]'`"
        [ -z "$hostname" ] && hostname="localhost-unknown"
@@ -722,10 +721,12 @@ mysqlinit() {
        chmod 751 "$MYSQL_CLUSTER_DIR" "$MYSQL_CLUSTER_DIR/mysqldb"
 
        if [ -f /usr/share/mysql/mysqld.conf -a ! -f "$MYSQL_CLUSTER_DIR/mysqld.conf" ]; then
-           sed -e "s#\(datadir.*\)=.*#\1= $MYSQL_DATA_DIR#g" \
-               -e "s#\(pid-file.*\)=.*#\1= $MYSQL_PIDFILE#g" \
-               -e "s#\(socket.*\)=.*#\1= $MYSQL_SOCKET#g" \
-               /usr/share/mysql/mysqld.conf > "$MYSQL_CLUSTER_DIR/mysqld.conf"
+           sed -e "
+               s#\(datadir.*\)=.*#\1= $MYSQL_DATA_DIR#g;
+               s#\(pid-file.*\)=.*#\1= $MYSQL_PIDFILE#g;
+               s#\(socket.*\)=.*#\1= $MYSQL_SOCKET#g;
+               s#@clusterdir@#$MYSQL_CLUSTER_DIR#g;
+               " /usr/share/mysql/mysqld.conf > "$MYSQL_CLUSTER_DIR/mysqld.conf"
            chown root:root "$MYSQL_CLUSTER_DIR/mysqld.conf"
            chmod 640 "$MYSQL_CLUSTER_DIR/mysqld.conf"
        fi

diff --git a/mysqld.conf b/mysqld.conf
index 35b312ac14070a8f10f0beb79c81961e71f24f7f..1dd98b9469b70d262091b186fd0b74343f50fa34 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -5,9 +5,9 @@
 
 ; This section must be the first!
 [mysqld]
-datadir     = /var/lib/mysql/mysqldb/db
-pid-file    = /var/lib/mysql/mysqldb/mysql.pid
-socket      = /var/lib/mysql/mysqldb/mysql.sock
+datadir     = @clusterdir@/mysqldb/db
+pid-file    = @clusterdir@/mysqldb/mysql.pid
+socket      = @clusterdir@/mysqldb/mysql.sock
 port        = 3306
 user        = mysql
 
@@ -155,16 +155,17 @@ myisam-recover
 ;
 ;skip-innodb
 
-innodb_data_home_dir = /var/lib/mysql/mysqldb/db
+; these are actual defaults (as of 5.0.26)
+innodb_data_home_dir = @clusterdir@/mysqldb/db
 innodb_data_file_path = ibdata1:10M:autoextend
 set-variable = innodb_mirrored_log_groups=1
-innodb_log_group_home_dir = /var/lib/mysql/mysqldb/db
+innodb_log_group_home_dir = @clusterdir@/mysqldb/db
 set-variable = innodb_log_files_in_group=2
 set-variable = innodb_log_file_size=5M
 set-variable = innodb_log_buffer_size=1M
 
 ;innodb_flush_log_at_trx_commit=1
-;innodb_log_arch_dir = /var/lib/mysql/innodb/log
+;innodb_log_arch_dir = @clusterdir@/innodb/log
 ;innodb_log_archive=0
 ;set-variable = innodb_buffer_pool_size=80M
 ;set-variable = innodb_additional_mem_pool_size=10M
@@ -178,9 +179,9 @@ set-variable = innodb_log_buffer_size=1M
 ; Don't use berkeley db (saves a lot of memory)
 ;skip-bdb
 
-;bdb-home          =  /var/lib/mysql/db
-;bdb-log-dir       =  /var/lib/mysql/bdb/log
-;bdb-tmpdir        =  /var/lib/mysql/bdb/tmp
+;bdb-home          =  @clusterdir@/db
+;bdb-log-dir       =  @clusterdir@/bdb/log
+;bdb-tmpdir        =  @clusterdir@/bdb/tmp
 
 
 ;bdb-lock-detect   =  DEFAULT