From c8ebca79ad314975a4955bf42fe7705b0c20e9f3 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 7 Mar 2006 18:40:08 +0000
Subject: [PATCH] mysql tried to remove a tmpfile that didn't exist, fixed
 check for this

---
 ChangeLog      | 1 +
 handlers/mysql | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 99a7aef..aec8d97 100644
--- 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 f89d8d7..ae54aae 100644
--- 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"
-- 
2.30.2