mysql tried to remove a tmpfile that didn't exist, fixed check for this

[matthijs/upstream/backupninja.git] / handlers / mysql

diff --git a/handlers/mysql b/handlers/mysql
index 3b82ddf99a048051e642884fc64b60129fc6a638..ae54aae7f2a2c0500b8999e03e043009e6eb7768 100644 (file)
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -24,7 +24,7 @@ getconf configfile /etc/mysql/debian.cnf
 local usevserver=no
 local vroot
 if [ $vservers_are_available = yes ]; then
-   if [ -z "$vsname" ]; then
+   if [ -n "$vsname" ]; then
       # does it exist ?
       if ! vservers_exist "$vsname" ; then
          fatal "The vserver given in vsname ($vsname) does not exist."
@@ -136,7 +136,7 @@ EOF
        fi
 fi
 
-# if a user is not set, use $confgfile, otherwise use $mycnf
+# if a user is not set, use $configfile, otherwise use $mycnf
 if [ "$user" == "" ]; then
        user=root;
        defaultsfile="--defaults-file=$configfile"
@@ -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
 
@@ -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"