X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=d3179309412bde11ca83bd85dd12165ac0c1bbed;hb=55b02f8536feaebbebc598cfb8a3f1abc08ced1c;hp=277a34553bbf24fb70d4dcfcfd4cf8db5bd918ef;hpb=cfc47e5571e61f4323b9f64f9cbb64dfbc4bf1b4;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/mysql b/handlers/mysql
index 277a345..d317930 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -1,4 +1,4 @@
-# -*- mode: sh; sh-basic-offset: 8; indent-tabs-mode: nil; -*-
+# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
 #
 # mysql handler script for backupninja
 #
@@ -139,15 +139,12 @@ EOF
 	else
 	    defaultsfile="--defaults-file=$mycnf"
 	fi
-	
-# if user is set, don't use $mycnf	
-elif [ "$userset" == "false" ]; then
-		defaultsfile="--defaults-file=$configfile"
 fi
 
+# if a user is not set, use $confgfile, otherwise use $mycnf
 if [ "$user" == "" ]; then
-	userset=false;
 	user=root;
+	defaultsfile="--defaults-file=$configfile"
 else
 	userset=true;
 	if [ $usevserver ]
@@ -238,6 +235,7 @@ then
     then
 	if [ $usevserver ]
 	then
+	    debug "echo show databases | $VSERVER $vsname exec su $user -c $MYSQL $defaultsfile | grep -v Database"
 	    databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
 	    if [ $? -ne 0 ]
 	    then