Show output of compression program to stdout, not stderr

[MkMySqlDump.git] / bin / mkmysqldump

diff --git a/bin/mkmysqldump b/bin/mkmysqldump
index 15d6657341671314e6e49beb22d2afcc099a1ce8..0dc345da357d5ec1b1b79e4804a43161fcedc67f 100755 (executable)
--- a/bin/mkmysqldump
+++ b/bin/mkmysqldump
@@ -71,7 +71,7 @@ while [ $# -gt 0 ]; do
                ;;
          "--user"|"-u")
                [ $# -ge 2 ] || Usage
-               MYHOST="$2"
+               MYUSER="$2"
                shift 2
                ;;
          "--password"|"-p")
@@ -115,10 +115,12 @@ while [ $# -gt 0 ]; do
 done
 
 echo "Dumping MySQL server on \"$MYHOST\" (user \"$MYUSER\"):"
+echo
 echo "Started: $(date)"
+
 umask 0077
 
-[ -n "$MYPW" ] && PWSWITCH="--password='$MYPW'" || PWSWITCH=""
+[ -n "$MYPW" ] && PWSWITCH="--password=$MYPW" || PWSWITCH=""
 
 echo "Getting list of databases from server ..."
 DATABASES=$(
@@ -134,13 +136,28 @@ if [ $? -ne 0 ]; then
        exit 1
 fi
 
+echo "Checking slave status ..."
+Slave_IO_Running=""; Slave_SQL_Running=""
+eval "$(echo 'SHOW SLAVE STATUS\G' | mysql -h "$MYHOST" -u "$MYUSER" $PWSWITCH | sed -n '/Running/p' | sed 's/: /=/g')"
+if [ -n "$Slave_IO_Running" -o -n "$Slave_SQL_Running" ]; then
+       if [ "$Slave_IO_Running" = "Yes" -a "$Slave_SQL_Running" = "Yes" ]; then
+               echo "Server is running as MySQL slave, replication is Ok."
+       else
+               echo "Server is running as MySQL slave, but replication FAILED!"
+               ErrorNotice
+               exit 1
+       fi
+else
+       echo "Server is not running as MySQL slave. Ok."
+fi
+
 echo "Will dump the following databases:"
 for d in $DATABASES; do
        echo " - $d"
 done
 
 echo "Dumping SQL data to file \"$OUTFILE\" ..."
-echo "Start date: $(date)"
+echo "Beginning dump: $(date)"
 CMD="mysqldump \
        -h $MYHOST \
        -u $MYUSER \
@@ -151,7 +168,8 @@ $CMD >"$OUTFILE"; r=$?
 if [ -n "$COMPRESS" -a -s "$OUTFILE" -a $r -eq 0 ]; then
        echo "Dump done: $(date)"
        echo "Compressing dump file ($COMPRESS) ..."
-       $COMPRESS "$OUTFILE"
+       $COMPRESS "$OUTFILE" 2>&1
+       [ $? -eq 0 ] || echo "Error compressing dump file!" >&2
 fi
 echo "End: $(date)"
 echo
@@ -168,10 +186,10 @@ fi
 
 if [ $r -eq 0 ]; then
        echo "Dump command exited with code 0, success."
+       echo
 else
        echo "Dump command FAILED with code $r!" >&2
        ErrorNotice
 fi
 
-echo
 exit $r