From: intrigeri <intrigeri@boum.org>
Date: Mon, 12 Jan 2009 22:47:30 +0000 (+0000)
Subject: mysql: fix 'mysqladmin ping' use, see changelog for details
X-Git-Tag: backupninja-0.9.7~41
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=94861df686d7083675af42890ececb70cb108b67;p=matthijs%2Fupstream%2Fbackupninja.git

mysql: fix 'mysqladmin ping' use, see changelog for details
---

diff --git a/ChangeLog b/ChangeLog
index 58ae954..33a51de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,11 @@ version 0.9.7 -- UNRELEASED
 	 . Options passed to mysqldump are now customizable with the new
 	   sqldumpoptions configuration variable. Thanks to Chris Lamb for his
 	   preliminary patch (Closes: #502966)
+	 . Hide 'mysqladmin ping' output, to prevent confusing the user in
+	   case mysqld is running but the authentication fails, which apparently
+	   does not prevent mysqldump to work.
+	 . Fix the error message displayed when mysqld is not running:
+	   mysqladmin ping indeed returns 0 when authentication fails.
 
 version 0.9.6 -- July 21, 2008
     backupninja changes
diff --git a/handlers/mysql.in b/handlers/mysql.in
index c80a36a..e34b16d 100644
--- a/handlers/mysql.in
+++ b/handlers/mysql.in
@@ -266,9 +266,9 @@ then
 		if [ $usevserver = yes ]
 		then
                    # Test to make sure mysqld is running, if it is not sqldump will not work
-                   $VSERVER $vsname exec su $user -c "$MYSQLADMIN $defaultsfile ping"
+                   $VSERVER $vsname exec su $user -c "$MYSQLADMIN $defaultsfile ping 2>&1 >/dev/null"
                    if [ $? -ne 0 ]; then
-                      fatal "Either you have an authentication problem, or mysqld doesn't appear to be running!"
+                      fatal "mysqld doesn't appear to be running!"
                    fi
                    if [ "$compress" == "yes" ]; then
                       execstr="$VSERVER $vsname exec $DUMP | $GZIP > $vroot$dumpdir/${db}.sql.gz"
@@ -277,9 +277,9 @@ then
                    fi
 		else
                    # Test to make sure mysqld is running, if it is not sqldump will not work
-                   su $user -c "$MYSQLADMIN $defaultsfile ping"
+                   su $user -c "$MYSQLADMIN $defaultsfile ping 2>&1 >/dev/null"
                    if [ $? -ne 0 ]; then
-                      fatal "Either you have an authentication problem, or mysqld doesn't appear to be running!"
+                      fatal "mysqld doesn't appear to be running!"
                    fi
                    if [ "$compress" == "yes" ]; then
                       execstr="$DUMP | $GZIP > $dumpdir/${db}.sql.gz"