X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mysql.init;h=d4250d700ddbf9a1ae1de86c2ebf6b3167db5670;hb=b3f27e197120f172edb0848e4fe4a90d13f18788;hp=20ccae477c1bbeb4bb8420e56c7692e2669cc4b6;hpb=e73c6ec92669bc28347dfad901f2e9970d2eec7e;p=packages%2Fmysql.git

diff --git a/mysql.init b/mysql.init
index 20ccae4..d4250d7 100644
--- a/mysql.init
+++ b/mysql.init
@@ -6,7 +6,6 @@
 #
 # description:  A very fast and reliable SQL database engine.
 #
-
 # Source function library
 . /etc/rc.d/init.d/functions
 
@@ -18,22 +17,30 @@ if [ -f /etc/sysconfig/mysql ]; then
 	. /etc/sysconfig/mysql
 else
 	nls "Error: %s not found" /etc/sysconfig/mysql
-	nls " MySQL can't be run."
+	nls "%s can't be run." MySQL
 	exit 1
 fi
 
-if [ "$MYSQL_DB_CLUSTERS" ]; then
+if [ -n "$MYSQL_DB_CLUSTERS" ]; then
 	nls "Warning: MYSQL_DB_CLUSTERS is set. It's obsolete. Use %s instead." /etc/mysql/clusters.conf
 fi
 
 if [ -f /etc/mysql/clusters.conf ]; then
-	MYSQL_DB_CLUSTERS=`cat /etc/mysql/clusters.conf | grep -v '^#' | cut -s -f 2 -d '='`
+	MYSQL_DB_CLUSTERS=$(grep -v '^#' /etc/mysql/clusters.conf | cut -s -f 2 -d '=')
+	if [ -z "$MYSQL_DB_CLUSTERS"  ]; then
+		nls "Warning: there are no configured clusters."
+	fi
+
 else
-	nls "Waning: Missing clusters config file %s" /etc/mysql/clusters.conf
-	nls "Using default cluster /var/lib/mysql (compatibility mode)"
-	MYSQL_DB_CLUSTERS=/var/lib/mysql
+	nls "Warning: Missing clusters config file %s" /etc/mysql/clusters.conf
+	if [ -z "$MYSQL_DB_CLUSTERS"  ]; then
+		nls "Warning: there are no configured clusters."
+		nls "Using default cluster /var/lib/mysql (compatibility mode)"
+		MYSQL_DB_CLUSTERS=/var/lib/mysql
+	fi
 fi
 
+
 # Check that networking is up
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status -a "$1" != init ]; then
@@ -47,7 +54,7 @@ fi
 action="$1"
 
 # any db cluster as command line argument?
-if [ $# -gt 1 ]; then\
+if [ $# -gt 1 ]; then
 	shift
 	# perform action for specified clusters only
 	DB_CLUSTERS="$@"
@@ -68,13 +75,13 @@ MYSQL_ERRLOG=/var/log/mysql/err
 # $1 - db cluster
 #
 # sets variables:
-# MYSQL_STATUS = running | not running
+# MYSQL_STATUS = running | not running | died
 # MYSQL_PID    = pid of mysqld process
 #
 mysqlstatus() {
 	clusterdir="$1"
 	mysqlgetconfig "$clusterdir"
-	
+
 	MYSQL_STATUS="not running"
 	MYSQL_PID="unknown"
 
@@ -83,7 +90,7 @@ mysqlstatus() {
 	if [ ! -d "/proc/$MYSQL_PID" -a "$MYSQL_PID" != "unknown" ]; then
 		MYSQL_STATUS="died"
 	elif [ -d "/proc/$MYSQL_PID" ]; then
-		grep -q "$MYSQL_PIDFILE" /proc/$MYSQL_PID/cmdline && MYSQL_STATUS="running" || MYSQL_STATUS="not running"
+		grep -qa "$MYSQL_PIDFILE" /proc/$MYSQL_PID/cmdline && MYSQL_STATUS="running" || MYSQL_STATUS="not running"
 	fi
 }
 
@@ -98,23 +105,29 @@ mysqlgetconfig() {
 
 	# emulate old behaviour if only one cluster specified
 	if [ "$clusterdir" = "$MYSQL_DB_CLUSTERS" -a "$clusterdir" = "/var/lib/mysql" -a -f /etc/mysqld.conf ]; then
-		MYSQL_NO_CLUSTER_COMPAT=yes; export MYSQL_NO_CLUSTER_COMPAT
+		MYSQL_RA_COMPAT=yes; export MYSQL_RA_COMPAT
 		config_file=/etc/mysqld.conf
-	fi
-	
-	config=`grep -v \"^#\" /etc/mysql/clusters.conf | grep \"$clusterdir$\" | cut -s -f 1 -d '='`
-	if [ -f "$config" ]; then
-		config_file=$config
-	elif [ -f /etc/mysql/$config ]; then
-		config_file=/etc/mysql/$config
-	elif [ -f "$clusterdir/mysqld.conf" ]; then
-		config_file=$clusterdir/mysqld.conf
-	elif [ -f /etc/mysql/mysqld.conf ]; then
-		config_file=/etc/mysql/mysqld.conf
+	else
+		# TODO: convert this piece of crap to awk
+		config=`grep -v "^#" /etc/mysql/clusters.conf | grep "${clusterdir}$" | cut -s -f 1 -d '='`
+		if echo "$config" | grep -q '^/'; then
+			config_file="$config"
+		elif [ -f "/etc/mysql/$config" ]; then
+			config_file=/etc/mysql/$config
+		else
+			config_file="$clusterdir/mysqld.conf"
+		fi
 	fi
 
 	MYSQL_CLUSTER_DIR="$clusterdir"; export MYSQL_CLUSTER_DIR
-	MYSQL_CONFIG="$config_file"; export MYSQL_CONFIG
+
+	if [ -z "$config_file" ]; then
+		nls "Error: Can't find config file for %s cluster" "$clusterdir"
+		exit 6
+	else
+		MYSQL_CONFIG="$config_file"; export MYSQL_CONFIG
+	fi
+
 	if [ ! -f "$config_file" ]; then
 		nls "Error: config file %s not found" "$config_file"
 		nls "MySQL can't be run. Did you initialize DB by doing \`$0 init'?"
@@ -143,18 +156,18 @@ END {
 ' $config_file`
 
 
-	if is_yes "$MYSQL_NO_CLUSTER_COMPAT"; then
+	if is_yes "$MYSQL_RA_COMPAT"; then
 		MYSQL_DATA_DIR_SUB=""
 	else
 		MYSQL_DATA_DIR_SUB="/mysqldb"
 	fi
-		
+
 	if [ -z "$MYSQL_DATA_DIR" -o "$MYSQL_DATA_DIR" != "${clusterdir}${MYSQL_DATA_DIR_SUB}/db" ]; then
 		nls "Error: datadir specified in %s should be %s" "$config_file" "$clusterdir${MYSQL_DATA_DIR_SUB}/db"
 		nls " MySQL can't be run."
 		exit 6
 	fi
-	
+
 	if [ -z "$MYSQL_PIDFILE" -o "$MYSQL_PIDFILE" != "$clusterdir${MYSQL_DATA_DIR_SUB}/mysql.pid" ]; then
 		nls "Error: pid-file specified in %s should be %s" "$config_file" "$clusterdir${MYSQL_DATA_DIR_SUB}/mysql.pid"
 		nls " MySQL can't be run."
@@ -201,6 +214,16 @@ mysqlstop() {
 	mysqlstatus "$clusterdir"
 	msg_stopping "MySQL $clusterdir"
 	busy
+
+# TODO
+#  graceful mysql shutdown with mysqladmin shutdown requires 'shutdown'
+#  privilege. create new user mysqlctl or rename mysql_logrotate to mysqlctl
+#  and give it both privs (flush-logs and shutdown)?
+
+	# try graceful shutdown -- send shutdown command
+	/usr/bin/mysqladmin --defaults-file=$MYSQL_CONFIG ${MYSQL_SOCKET:+--socket=$MYSQL_SOCKET} shutdown >/dev/null 2>&1
+	mysqlstatus "$clusterdir"
+
 	[ "$MYSQL_PID" != "unknown" ] && kill -TERM "$MYSQL_PID" 2> /dev/null
 	# 3 seconds
 	for nr in 1 2 3; do
@@ -214,6 +237,8 @@ mysqlstop() {
 	else
 		ok
 	fi
+
+	# FIXME: should let mysqld remove pid by itself?
 	rm -f "$MYSQL_PIDFILE"
 }
 
@@ -242,22 +267,24 @@ mysqlinit() {
 		exit 1
 	fi
 
-	#if [ -f "$clusterdir/mysqld.conf" ]; then
-	# Let's say that config for each cluster is mandatory...
-	mysqlgetconfig "$clusterdir"
-	#else
-	#	MYSQL_USER="mysql"
-	#	MYSQL_CLUSTER_DIR="$clusterdir"
-	#	MYSQL_DATA_DIR="$clusterdir/mysqldb/db"
-	#	MYSQL_PIDFILE="$clusterdir/mysqldb/mysql.pid"
-	#	MYSQL_SOCKET="$clusterdir/mysqldb/mysql.sock"
-	#fi
+	if [ -f "$clusterdir/mysqld.conf" ]; then
+		mysqlgetconfig "$clusterdir"
+	else
+		MYSQL_USER="mysql"
+		MYSQL_CLUSTER_DIR="$clusterdir"
+		MYSQL_DATA_DIR="$clusterdir/mysqldb/db"
+		MYSQL_PIDFILE="$clusterdir/mysqldb/mysql.pid"
+		MYSQL_SOCKET="$clusterdir/mysqldb/mysql.sock"
+
+		# this $MYSQL_CONFIG will be created later
+		MYSQL_CONFIG="$MYSQL_CLUSTER_DIR/mysqld.conf"
+	fi
 
 	nls "Initializing cluster %s" "$clusterdir"
 
 	# Check if not exist init database
 	if [ -d "$MYSQL_DATA_DIR/mysql" ]; then
-		nls "Seems that database is initialized now. Remove by hand %s" "$MYSQL_DATA_DIR/mysqldb/mysql"
+		nls "Seems that database is initialized now. Remove by hand %s" "$MYSQL_DATA_DIR/mysql"
 		nls "before initializing database."
 		nls "For now skipping cluster %s." "$clusterdir"
 		return
@@ -265,13 +292,13 @@ mysqlinit() {
 
 	show "Creating privilege mysql tables for $MYSQL_DATA_DIR"
 	busy
-	TMP=/tmp TMPDIR=/tmp 
+	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"
-		
+
 	# Check if hostname is valid
 	if [ -z "$hostname" ]; then
 		deltext
@@ -279,7 +306,7 @@ mysqlinit() {
 		nls "Sorry, the host name is not configured."
 		nls "Please configure the 'hostname' command to return a hostname."
 		exit 1
-	elif ! hostname -i >/dev/null 2>&1; then 
+	elif ! hostname -i >/dev/null 2>&1; then
 		deltext
 		fail
 		nls "Sorry, the host '%s' could not be looked up." "$hostname"
@@ -288,11 +315,11 @@ mysqlinit() {
 	fi
 
 	# Initialize variables
-	c_d="" i_d=""
-	c_h="" i_h=""
-	c_u="" i_u=""
-	c_f="" i_f=""
-	c_t="" c_c=""
+	c_d="" i_d="" c_ht=""  c_tz=""
+	c_h="" i_h="" c_hc=""  c_tzt=""
+	c_u="" i_u="" c_hk=""  c_tztt=""
+	c_f="" i_f="" c_hr=""  c_tzls=""
+	c_t="" c_c="" c_tzn=""
 
 	# Check for old tables
 	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/db.frm
@@ -317,11 +344,12 @@ mysqlinit() {
 	  c_d="$c_d PRIMARY KEY Host (Host,Db,User),"
 	  c_d="$c_d KEY User (User)"
 	  c_d="$c_d )"
+	  c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
 	  c_d="$c_d comment='Database privileges';"
 
 	  i_d="INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
 	  INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');"
-	    
+
 	fi
 
 	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/host.frm
@@ -343,6 +371,7 @@ mysqlinit() {
 	  c_h="$c_h  Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
 	  c_h="$c_h  PRIMARY KEY Host (Host,Db)"
 	  c_h="$c_h )"
+	  c_h="$c_h CHARACTER SET utf8 COLLATE utf8_bin"
 	  c_h="$c_h comment='Host privileges;  Merged with database privileges';"
 	fi
 
@@ -351,7 +380,7 @@ mysqlinit() {
 	  c_u="$c_u CREATE TABLE user ("
 	  c_u="$c_u   Host char(60) DEFAULT '' NOT NULL,"
 	  c_u="$c_u   User char(16) DEFAULT '' NOT NULL,"
-	  c_u="$c_u   Password char(16) DEFAULT '' NOT NULL,"
+	  c_u="$c_u   Password char(41) DEFAULT '' NOT NULL,"
 	  c_u="$c_u   Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
 	  c_u="$c_u   Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
 	  c_u="$c_u   Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
@@ -382,6 +411,7 @@ mysqlinit() {
 	  c_u="$c_u   max_connections int(11) unsigned DEFAULT 0  NOT NULL,"
 	  c_u="$c_u   PRIMARY KEY Host (Host,User)"
 	  c_u="$c_u )"
+	  c_u="$c_u CHARACTER SET utf8 COLLATE utf8_bin"
 	  c_u="$c_u comment='Users and global privileges';"
 
 	  i_u="INSERT INTO user VALUES ('localhost','mysql','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
@@ -402,7 +432,8 @@ mysqlinit() {
 	  c_f="$c_f   type enum ('function','aggregate') NOT NULL,"
 	  c_f="$c_f   PRIMARY KEY (name)"
 	  c_f="$c_f )"
-	  c_f="$c_f   comment='User defined functions';"
+	  c_f="$c_f CHARACTER SET utf8 COLLATE utf8_bin"
+	  c_f="$c_f comment='User defined functions';"
 	fi
 
 	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/tables_priv.frm
@@ -419,27 +450,142 @@ mysqlinit() {
 	  c_t="$c_t   PRIMARY KEY (Host,Db,User,Table_name),"
 	  c_t="$c_t   KEY Grantor (Grantor)"
 	  c_t="$c_t )"
-	  c_t="$c_t   comment='Table privileges';"
+	  c_t="$c_t CHARACTER SET utf8 COLLATE utf8_bin"
+	  c_t="$c_t comment='Table privileges';"
 	fi
 
 	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/columns_priv.frm
 	then
 	  c_c="$c_c CREATE TABLE columns_priv ("
 	  c_c="$c_c   Host char(60) DEFAULT '' NOT NULL,"
-	  c_c="$c_c   Db char(60) DEFAULT '' NOT NULL,"
+	  c_c="$c_c   Db char(64) DEFAULT '' NOT NULL,"
 	  c_c="$c_c   User char(16) DEFAULT '' NOT NULL,"
-	  c_c="$c_c   Table_name char(60) DEFAULT '' NOT NULL,"
-	  c_c="$c_c   Column_name char(60) DEFAULT '' NOT NULL,"
+	  c_c="$c_c   Table_name char(64) DEFAULT '' NOT NULL,"
+	  c_c="$c_c   Column_name char(64) DEFAULT '' NOT NULL,"
 	  c_c="$c_c   Timestamp timestamp(14),"
 	  c_c="$c_c   Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL,"
 	  c_c="$c_c   PRIMARY KEY (Host,Db,User,Table_name,Column_name)"
 	  c_c="$c_c )"
-	  c_c="$c_c   comment='Column privileges';"
+	  c_c="$c_c CHARACTER SET utf8 COLLATE utf8_bin"
+	  c_c="$c_c comment='Column privileges';"
+	fi
+
+	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/help_topic.frm
+	then
+	  c_ht="$c_ht CREATE TABLE help_topic ("
+	  c_ht="$c_ht   help_topic_id    int unsigned not null,"
+	  c_ht="$c_ht   name             varchar(64) not null,"
+      c_ht="$c_ht   help_category_id smallint unsigned not null,"
+	  c_ht="$c_ht   description      text not null,"
+	  c_ht="$c_ht   example          text not null,"
+	  c_ht="$c_ht   url              varchar(128) not null,"
+	  c_ht="$c_ht   primary key      (help_topic_id),"
+	  c_ht="$c_ht   unique index     (name)"
+	  c_ht="$c_ht )"
+	  c_ht="$c_ht CHARACTER SET utf8"
+	  c_ht="$c_ht comment='help topics';"
+	fi
+
+	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/help_category.frm
+	then
+	  c_hc="$c_hc CREATE TABLE help_category ("
+	  c_hc="$c_hc   help_category_id   smallint unsigned not null,"
+	  c_hc="$c_hc   name               varchar(64) not null,"
+	  c_hc="$c_hc   parent_category_id smallint unsigned null,"
+	  c_hc="$c_hc   url                varchar(128) not null,"
+	  c_hc="$c_hc   primary key        (help_category_id),"
+	  c_hc="$c_hc   unique index       (name)"
+	  c_hc="$c_hc )"
+	  c_hc="$c_hc   CHARACTER SET utf8"
+	  c_hc="$c_hc comment='help categories';"
+	fi
+
+	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/help_keyword.frm
+	then
+	  c_hk="$c_hk CREATE TABLE help_keyword ("
+	  c_hk="$c_hk   help_keyword_id  int unsigned not null,"
+	  c_hk="$c_hk   name             varchar(64) not null,"
+	  c_hk="$c_hk   primary key      (help_keyword_id),"
+	  c_hk="$c_hk   unique index     (name)"
+	  c_hk="$c_hk )"
+	  c_hk="$c_hk   CHARACTER SET utf8"
+	  c_hk="$c_hk comment='help keywords';"
+	fi
+
+	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/help_relation.frm
+	then
+	  c_hr="$c_hr CREATE TABLE help_relation ("
+	  c_hr="$c_hr   help_topic_id    int unsigned not null references help_topic,"
+	  c_hr="$c_hr   help_keyword_id  int unsigned not null references help_keyword,"
+	  c_hr="$c_hr   primary key      (help_keyword_id, help_topic_id)"
+	  c_hr="$c_hr )"
+	  c_hr="$c_hr   CHARACTER SET utf8"
+	  c_hr="$c_hr comment='keyword-topic relation';"
+	fi
+
+	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/time_zone_name.frm
+	then
+	  c_tzn="$c_tzn CREATE TABLE time_zone_name ("
+	  c_tzn="$c_tzn   Name char(64) NOT NULL,"
+	  c_tzn="$c_tzn   Time_zone_id int unsigned NOT NULL,"
+	  c_tzn="$c_tzn   PRIMARY KEY Name (Name)"
+	  c_tzn="$c_tzn )"
+	  c_tzn="$c_tzn   CHARACTER SET utf8"
+	  c_tzn="$c_tzn comment='Time zone names';"
+	fi
+
+	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/time_zone.frm
+	then
+	  c_tz="$c_tz CREATE TABLE time_zone ("
+	  c_tz="$c_tz   Time_zone_id int unsigned NOT NULL auto_increment,"
+	  c_tz="$c_tz   Use_leap_seconds enum('Y','N') DEFAULT 'N' NOT NULL,"
+	  c_tz="$c_tz   PRIMARY KEY TzId (Time_zone_id)"
+	  c_tz="$c_tz )"
+	  c_tz="$c_tz   CHARACTER SET utf8"
+	  c_tz="$c_tz comment='Time zones';"
+	fi
+
+	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/time_zone_transition.frm
+	then
+	  c_tzt="$c_tzt CREATE TABLE time_zone_transition ("
+	  c_tzt="$c_tzt   Time_zone_id int unsigned NOT NULL,"
+	  c_tzt="$c_tzt   Transition_time bigint signed NOT NULL,"
+	  c_tzt="$c_tzt   Transition_type_id int unsigned NOT NULL,"
+	  c_tzt="$c_tzt   PRIMARY KEY TzIdTranTime (Time_zone_id, Transition_time)"
+	  c_tzt="$c_tzt )"
+	  c_tzt="$c_tzt   CHARACTER SET utf8"
+	  c_tzt="$c_tzt comment='Time zone transitions';"
+	fi
+
+	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/time_zone_transition_type.frm
+	then
+	  c_tztt="$c_tztt CREATE TABLE time_zone_transition_type ("
+	  c_tztt="$c_tztt   Time_zone_id int unsigned NOT NULL,"
+	  c_tztt="$c_tztt   Transition_type_id int unsigned NOT NULL,"
+	  c_tztt="$c_tztt   Offset int signed DEFAULT 0 NOT NULL,"
+	  c_tztt="$c_tztt   Is_DST tinyint unsigned DEFAULT 0 NOT NULL,"
+	  c_tztt="$c_tztt   Abbreviation char(8) DEFAULT '' NOT NULL,"
+	  c_tztt="$c_tztt   PRIMARY KEY TzIdTrTId (Time_zone_id, Transition_type_id)"
+	  c_tztt="$c_tztt )"
+	  c_tztt="$c_tztt   CHARACTER SET utf8"
+	  c_tztt="$c_tztt comment='Time zone transition types';"
+	fi
+
+	if test ! -f $MYSQL_DATA_DIR/mysqldb/mysql/time_zone_leap_second.frm
+	then
+	  c_tzls="$c_tzls CREATE TABLE time_zone_leap_second ("
+	  c_tzls="$c_tzls   Transition_time bigint signed NOT NULL,"
+	  c_tzls="$c_tzls   Correction int signed NOT NULL,"
+	  c_tzls="$c_tzls   PRIMARY KEY TranTime (Transition_time)"
+	  c_tzls="$c_tzls )"
+	  c_tzls="$c_tzls CHARACTER SET utf8"
+	  c_tzls="$c_tzls   comment='Leap seconds information for time zones';"
 	fi
 
 	mkdir -p "$MYSQL_DATA_DIR" > /dev/null 2>&1
+	# Using mysql:mysql for MYSQL_CLUSTER_DIR is creating SECURITY hole, root:root is proper
 	chown root:root "$MYSQL_CLUSTER_DIR"
-        chown mysql:mysql "$MYSQL_CLUSTER_DIR/mysqldb" "$MYSQL_DATA_DIR" > /dev/null 2>&1
+    chown mysql:mysql "$MYSQL_CLUSTER_DIR/mysqldb" "$MYSQL_DATA_DIR" > /dev/null 2>&1
 	chmod 751 "$MYSQL_CLUSTER_DIR" "$MYSQL_CLUSTER_DIR/mysqldb"
 
 	if [ -f /usr/share/mysql/mysqld.conf -a ! -f "$MYSQL_CLUSTER_DIR/mysqld.conf" ]; then
@@ -473,8 +619,19 @@ $i_f
 
 $c_t
 $c_c
+
+$c_ht
+$c_hc
+$c_hk
+$c_hr
+
+$c_tzn
+$c_tz
+$c_tzt
+$c_tztt
+$c_tzls
 END_OF_DATA
-	then 
+	then
 	    ok
 	cat << END_OF_MSG
 
@@ -488,10 +645,8 @@ This is done (after starting database) with:
 NOTE: mysql_logrotate password should be placed to $MYSQL_CONFIG in
 mysqladmin section. See the manual for more instructions.
 
-IMPORTANT: The configuration file is mysqld.conf in MYSQ_DB_CLUSTERS directories.
-
 END_OF_MSG
-      else  
+      else
 	    fail
 	    cat << END_OF_MSG
 Installation of grant tables FAILED!
@@ -512,13 +667,13 @@ logging in /etc/mysqld.conf gives you a log in /var/log/mysql/log that
 may be helpful. The latest information about MySQL is available on the
 web at http://www.mysql.com/.
 
-Please check PLD ftp site for newer versions of this package.
+Please check PLD Linux ftp site for newer versions of this package.
 
 Please consult the MySQL manual section: 'Problems running
 mysql_install_db', and the manual section that describes problems on
 your OS.  Another information source is the MySQL email archive.
 Please check all of the above before mailing us!  And if you do mail
-us, you MUST use the /usr/bin/mysqlbug script!  
+us, you MUST use the /usr/bin/mysqlbug script!
 
 END_OF_MSG
 
@@ -561,6 +716,7 @@ case "$action" in
 	mysqlsubsys
 	;;
   status)
+	status mysqld
 	for mysqldir in $DB_CLUSTERS; do
 		mysqlstatus "$mysqldir"
 		echo "MySQL cluster $mysqldir: $MYSQL_STATUS"
@@ -568,8 +724,8 @@ case "$action" in
 	exit $?
 	;;
   restart|force-reload)
-	$0 stop
-	$0 start
+	$0 stop $DB_CLUSTERS
+	$0 start $DB_CLUSTERS
 	exit $?
 	;;
   init)
@@ -581,7 +737,10 @@ case "$action" in
   flush-logs)
   	for mysqldir in $DB_CLUSTERS; do
 	    mysqlgetconfig "$mysqldir"
-	    /usr/bin/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" flush-logs
+		# just if mysqld is really running
+		if /usr/bin/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" ping >/dev/null 2>&1; then
+			/usr/bin/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" flush-logs
+		fi
 	done
 	;;
   *)