X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=52193f4ec0afa8642dd0daaf7ddc299315952f1f;hb=59fa8f8ffe36f8004d1da76d1e03c57e6b1cbe81;hp=ebde4abf6e427dcdbd50c3a34026fa88257b193f;hpb=1f21ab1f9d87fdf363552764fc538ceb34c4105e;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/mysql b/handlers/mysql
index ebde4ab..52193f4 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -160,7 +160,7 @@ else
 	
 	debug "User home set to: $userhome"
 	[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
-	defaultsfile="--defaults-file=$vuserhome/.my.cnf"
+	defaultsfile="--defaults-file=$userhome/.my.cnf"
 	debug "using $defaultsfile"
 fi
 
@@ -179,7 +179,7 @@ then
 	else
 		execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
 	fi
-	debug "su $user -c '$execstr'"
+	debug "su $user -c \"$execstr\""
 	if [ ! $test ]
 	then
 		output=`su $user -c "$execstr" 2>&1`
@@ -202,7 +202,7 @@ then
 		else
 			execstr="$MYSQLHOTCOPY --allowold $db $hotdir"
 		fi
-		debug "su $user -c '$execstr'"
+		debug 'su $user -c \"$execstr\"'
 		if [ ! $test ]
 		then
 			output=`su $user -c "$execstr" 2>&1`
@@ -230,7 +230,7 @@ then
     then
 	if [ $usevserver = yes ]
 	then
-	    debug "echo show databases | $VSERVER $vsname exec su $user -c $MYSQL $defaultsfile | grep -v Database"
+	    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
@@ -253,7 +253,7 @@ fi
 		else
 			execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql"
 		fi
-		debug "su $user -c '$execstr'"
+		debug "su $user -c \"$execstr\""
 		if [ ! $test ]
 		then
 			output=`su $user -c "$execstr" 2>&1`
@@ -277,7 +277,7 @@ fi
 fi
 
 # clean up tmp config file
-if [ "$dbusername" != "" ]
+if [ "$dbusername" != "" -a "$dbpassword" != "" ]
 then
 	## clean up tmp config file
 	debug "rm $mycnf"