SOURCES: mysql.init, mysqld.conf - use @clusterdir@ placeholder
glen
glen at pld-linux.org
Sun Oct 22 22:50:38 CEST 2006
Author: glen Date: Sun Oct 22 20:50:38 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- use @clusterdir@ placeholder
---- Files affected:
SOURCES:
mysql.init (1.102 -> 1.103) , mysqld.conf (1.32 -> 1.33)
---- Diffs:
================================================================
Index: SOURCES/mysql.init
diff -u SOURCES/mysql.init:1.102 SOURCES/mysql.init:1.103
--- SOURCES/mysql.init:1.102 Thu Oct 12 23:32:38 2006
+++ SOURCES/mysql.init Sun Oct 22 22:50:32 2006
@@ -332,7 +332,6 @@
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 @@
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
================================================================
Index: SOURCES/mysqld.conf
diff -u SOURCES/mysqld.conf:1.32 SOURCES/mysqld.conf:1.33
--- SOURCES/mysqld.conf:1.32 Sun Oct 22 22:47:12 2006
+++ SOURCES/mysqld.conf Sun Oct 22 22:50:33 2006
@@ -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 @@
;
;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 @@
; 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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mysql.init?r1=1.102&r2=1.103&f=u
http://cvs.pld-linux.org/SOURCES/mysqld.conf?r1=1.32&r2=1.33&f=u
More information about the pld-cvs-commit
mailing list