X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=b3d0a73b08b709325372211dd8731ee0e2f2ff0c;hb=65f7b42f544579a8fbf30e82589ef98c6d30e9ef;hp=02289f1f2618e197c6e64bc59140869a9f1d31fc;hpb=32e13d4c6573fecca4964b1a9f77254823d2e589;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/mysql b/handlers/mysql
index 02289f1..b3d0a73 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -234,13 +234,13 @@ then
 	    databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
 	    if [ $? -ne 0 ]
 	    then
-	        fatal "Authentication problem, maybe user/password is wrong"
+	        fatal "Authentication problem, maybe user/password is wrong or mysqld is not running?"
 	    fi
 	else
 		databases=`echo 'show databases' | su $user -c "$MYSQL $defaultsfile" | grep -v Database`
 		if [ $? -ne 0 ]
 		then
-		    fatal "Authentication problem, maybe user/password is wrong"
+		    fatal "Authentication problem, maybe user/password is wrong or mysqld is not running?"
 		fi
 	fi
 fi
@@ -249,16 +249,26 @@ fi
 	do
 		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"
+                   if [ $? -ne 0 ]; then
+                      fatal "Either you have an authentication problem, or mysqld doesn't appear to be running!"
+                   fi
                    if [ "$compress" == "yes" ]; then
                       execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db | $GZIP > $vroot$dumpdir/${db}.sql.gz"
                    else
-                      execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $vroot$dumpdir/${db}.sql"
+                      execstr="$VSERVER $vsname exec $MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db -r $vroot$dumpdir/${db}.sql"
                    fi
 		else
+                   # Test to make sure mysqld is running, if it is not sqldump will not work
+                   su $user -c "$MYSQLADMIN $defaultsfile ping"
+                   if [ $? -ne 0 ]; then
+                      fatal "Either you have an authentication problem, or mysqld doesn't appear to be running!"
+                   fi
                    if [ "$compress" == "yes" ]; then
                       execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db | $GZIP > $dumpdir/${db}.sql.gz"
                    else
-                      execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql"
+                      execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db -r $dumpdir/${db}.sql"
                    fi
 		fi
 		debug "su $user -c \"$execstr\""
@@ -276,6 +286,7 @@ fi
 			fi
 		fi
 	done
+fi
 
 # clean up tmp config file
 if [ "$dbusername" != "" -a "$dbpassword" != "" ]