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

diff --git a/ChangeLog b/ChangeLog
index 99a7aefcf565b1ebd24f8c3da4792c27521e2268..aec8d9741f03c379eae6b12763402959045c6038 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ version 0.9.4 -- unreleased
        mysql, pgsql, svn: fixed inversed vsname emptyness check
        mysql:
         . Fixed improper use of $vuserhome (Debian: #351083)
+        . Fixed erroneous removal of tmpfile when it didn't exit
     lib changes
        vserver:
         . init_vservers: fixed Debian bug #351083 (improper readlink syntax)

diff --git a/handlers/mysql b/handlers/mysql
index f89d8d724bccd00d6a401f0cd408cb740ab2f8c9..ae54aae7f2a2c0500b8999e03e043009e6eb7768 100644 (file)
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -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"