X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql.in;h=fe1e7832f32ee43c090cf5e17d6e985e040f8376;hb=539fd1471907422d81626260ea4f1e23e4d398a4;hp=e34b16dbb0c3c3d697d9ac0152079f70a53a1b79;hpb=94861df686d7083675af42890ececb70cb108b67;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/mysql.in b/handlers/mysql.in
index e34b16d..fe1e783 100644
--- a/handlers/mysql.in
+++ b/handlers/mysql.in
@@ -10,7 +10,6 @@ getconf nodata
 getconf dbhost localhost
 getconf hotcopy no
 getconf sqldump no
-getconf sqldumpoptions "--lock-tables --complete-insert --add-drop-table --quick --quote-names"
 getconf compress yes
 getconf vsname
 
@@ -246,7 +245,7 @@ then
 
 	for db in $databases
 	do
-           DUMP_BASE="$MYSQLDUMP $defaultsfile $sqldumpoptions"
+           DUMP_BASE="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names"
 
            # Dumping structure and data
            DUMP="$DUMP_BASE $ignore $db"
@@ -266,9 +265,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 2>&1 >/dev/null"
+                   $VSERVER $vsname exec su $user -c "$MYSQLADMIN $defaultsfile ping"
                    if [ $? -ne 0 ]; then
-                      fatal "mysqld doesn't appear to be running!"
+                      fatal "Either you have an authentication problem, or 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 +276,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 2>&1 >/dev/null"
+                   su $user -c "$MYSQLADMIN $defaultsfile ping"
                    if [ $? -ne 0 ]; then
-                      fatal "mysqld doesn't appear to be running!"
+                      fatal "Either you have an authentication problem, or mysqld doesn't appear to be running!"
                    fi
                    if [ "$compress" == "yes" ]; then
                       execstr="$DUMP | $GZIP > $dumpdir/${db}.sql.gz"