X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mysql.init;h=ab323549a136fd1178b1065d07c167f4b0b0e657;hb=ab9f9c78514dc9ee98f440c27496552fd6f61e8e;hp=b606ab668aa7603413ac0dd8b9984bdec431ae3f;hpb=3dc69a76309c619db43eee85ada68de859cf9d89;p=packages%2Fmysql.git

diff --git a/mysql.init b/mysql.init
old mode 100644
new mode 100755
index b606ab6..ab32354
--- a/mysql.init
+++ b/mysql.init
@@ -5,8 +5,6 @@
 # chkconfig:	2345 84 25
 #
 # description:  A very fast and reliable SQL database engine.
-#
-# $Id$
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -102,7 +100,7 @@ mysqlstatus() {
 	clusterdir="$1"
 	mode="$2"
 	
-	mysqlgetconfig "$clusterdir"
+	mysqlgetconfig "$clusterdir" status
 
 	MYSQL_STATUS="not running"
 	MYSQL_PID="unknown"
@@ -153,9 +151,11 @@ mysqlstatus() {
 #
 # arguments
 # $1 - db cluster
+# $2 - status | other
 
 mysqlgetconfig() {
 	local clusterdir="$1" config_file
+	local mode="$2"
 
 	# emulate old behaviour if only one cluster specified
 	if [ "$clusterdir" = "$MYSQL_DB_CLUSTERS" -a "$clusterdir" = "/var/lib/mysql" -a -f /etc/mysqld.conf ]; then
@@ -176,7 +176,11 @@ mysqlgetconfig() {
 
 	if [ -z "$config_file" ]; then
 		nls "Error: Can't find config file for %s cluster" "$clusterdir"
-		exit 6
+		if [ "$mode" = "status" ]; then 
+			exit 3
+		else
+			exit 6
+		fi
 	else
 		MYSQL_CONFIG="$config_file"
 	fi
@@ -184,7 +188,11 @@ mysqlgetconfig() {
 	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'?"
-		exit 6
+		if [ "$mode" = "status" ]; then 
+			exit 3
+		else
+			exit 6
+		fi
 	fi
 
 	# reset to initial state
@@ -347,6 +355,61 @@ mysqlstop() {
 	fi
 }
 
+# report slave status
+# uses MYSQL_SOCKET - path to mysql socket
+slave_status() {
+	# see if slave status can be reported
+	local err=0 slave_status=$(mysql --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" -e 'show slave status\G')
+	if [ -z "$slave_status" ]; then
+		# slave not setup
+		return
+	fi
+
+	printf "Slave Status:\n"
+
+	set -f
+	eval $(echo "$slave_status" | awk -F': ' '/^ *[A-Za-z_]+:/{
+		k = tolower($1);
+		v = substr($0, length($1) + 3);
+		gsub(/\\/, "\\\\\\", v);
+		gsub(/"/, "\\\"", v);
+		gsub(/`/, "\\`", v);
+		gsub(/\$/, "\\$", v);
+		gsub(/\$/, "\\$", v);
+		printf("%s=\"%s\";\n", k, v);
+	}')
+	set +f
+
+	if [ "$slave_io_running" != "Yes" ]; then
+		printf "\tSlave IO not running\n"
+		err=1
+	fi
+	if [ "$slave_sql_running" != "Yes" ]; then
+		printf "\tSlave SQL not running\n"
+		err=1
+	fi
+
+	if [ "$err" = 1 -a "$last_errno" -gt 0 ]; then
+		printf "\tERROR %s: %s\n" "$last_errno" "$last_error"
+	fi
+
+	if [ "$master_log_file" != "$relay_master_log_file" ]; then
+		printf "\tERROR logfile mismatch (%s)\n" "$relay_master_log_file"
+		err=1
+	fi
+
+	if [ -z "$read_master_log_pos" -o -z "$exec_master_log_pos" ]; then
+		printf "\tERROR No info about master\n"
+		err=1
+		return
+	fi
+
+	diff=$(($read_master_log_pos - $exec_master_log_pos))
+	printf "\tread pos: %s (%s) (host: %s:%d)\n" "$read_master_log_pos" "$master_log_file" "$master_host" "$master_port"
+	printf "\texec pos: %s\n" "$exec_master_log_pos"
+	printf "\tdiff: %s\n" "$diff"
+}
+
 #
 # check for running mysql instances; if any instance is running then
 # create subsys lock file
@@ -385,7 +448,7 @@ mysqlinit() {
 		MYSQL_CONFIG="$MYSQL_CLUSTER_DIR/mysqld.conf"
 	fi
 
-	show "Initializing cluster %s" "$clusterdir"; echo
+	show "Initializing cluster %s" "$clusterdir"; started
 
 	# Check if not exist init database
 	if [ -d "$MYSQL_DATA_DIR/mysql" ]; then
@@ -433,7 +496,6 @@ EOF
 		--defaults-file=$MYSQL_CLUSTER_DIR/mysqld.conf \
 		--bootstrap \
 		--skip-grant-tables \
-		--skip-innodb \
 		--datadir=$MYSQL_DATA_DIR \
 		--user=$MYSQL_USER \
 		--slave-load-tmpdir=$MYSQL_DATA_DIR \
@@ -469,7 +531,6 @@ END_OF_MSG
 			--defaults-file=$MYSQL_CLUSTER_DIR/mysqld.conf \
 			--bootstrap \
 			--skip-grant-tables \
-			--skip-innodb \
 			--datadir=$MYSQL_DATA_DIR \
 			--user=$MYSQL_USER \
 			--slave-load-tmpdir=$MYSQL_DATA_DIR \
@@ -489,7 +550,11 @@ END_OF_MSG
 	else
 		fail
 		cat << END_OF_MSG
-Installation of grant tables FAILED!
+ERROR:
+ERROR:
+ERROR: Installation of grant tables FAILED!
+ERROR:
+ERROR:
 
 The initialization SQL script was preserved at $MYSQL_DATA_DIR/mysql-init.sql
 
@@ -561,50 +626,23 @@ condrestart() {
 	start
 }
 
-RETVAL=0
-case "$action" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart)
-	stop
-	start
-	;;
-  try-restart)
-	condrestart 0
-	;;
-  force-reload)
-	condrestart 7
-	;;
-  init)
-	for mysqldir in $DB_CLUSTERS; do
-		mysqlinit "$mysqldir"
-	done
-	exit $?
-	;;
-  flush-logs)
-	for mysqldir in $DB_CLUSTERS; do
-	    mysqlgetconfig "$mysqldir"
-		# 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
-	;;
-  status)
+status() {
+	local mysqldir addr port socket pid pids running datadir 
+	RETVAL=3
 	for mysqldir in $DB_CLUSTERS; do
 		mysqlstatus "$mysqldir"
 		if [ "$MYSQL_STATUS" = "running" ]; then
+			RETVAL=0
 			addr=${MYSQL_BIND_ADDRESS:-0.0.0.0}
 			port=${MYSQL_PORT:-3306}
 			socket=${MYSQL_SOCKET:-/var/lib/mysql/mysql.sock}
 			pid=$MYSQL_PID
 			nls "MySQL cluster %s, pid %s\n" "$mysqldir" "$pid"
 			[ -z "$MYSQL_SKIP_NETWORKING" ] && nls "\ttcp:%s:%s\n" "$addr" "$port"
-			nls "\tunix:%s\n" "$socket"
+			nls "\tunix: %s\n" "$socket"
+
+			MYSQL_SOCKET=$socket slave_status
+
 			pids="$pids/$MYSQL_PID/"
 			progress "$MYSQL_STATUS"
 		else
@@ -634,7 +672,10 @@ case "$action" in
 				socket=${MYSQL_SOCKET:-/var/lib/mysql/mysql.sock}
 				nls "MySQL cluster %s, pid %s\n" "$mysqldir" "$pid"
 				[ -z "$MYSQL_SKIP_NETWORKING" ] && nls "\ttcp:%s:%s\n" "$addr" "$port"
-				nls "\tunix:%s\n" "$socket"
+				nls "\tunix: %s\n" "$socket"
+
+				MYSQL_SOCKET=$socket slave_status
+
 				progress "$MYSQL_STATUS"
 			else
 				show "MySQL cluster %s" "$mysqldir"
@@ -643,6 +684,43 @@ case "$action" in
 			echo
 		done
 	fi
+}
+
+RETVAL=0
+case "$action" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart)
+	stop
+	start
+	;;
+  try-restart)
+	condrestart 0
+	;;
+  force-reload)
+	condrestart 7
+	;;
+  init)
+	for mysqldir in $DB_CLUSTERS; do
+		mysqlinit "$mysqldir"
+	done
+	exit $?
+	;;
+  flush-logs)
+	for mysqldir in $DB_CLUSTERS; do
+	    mysqlgetconfig "$mysqldir"
+		# 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
+	;;
+  status)
+	status
 	;;
   *)
 	msg_usage "$0 {start|stop|restart|try-restart|force-reload|init|flush-logs|status}"