bug 5612: some versions of Berkeley DB can get into a deadlock condition if files named __db.{filename} are present; work around more thoroughly this time.  (previous patch omitted some failure cases)
bug 5612: some versions of Berkeley DB can get into a deadlock condition if files named __db.{filename} are present; work around more thoroughly this time.  (previous patch omitted some failure cases)

git-svn-id: e9fe9b84e32fc5e57b7d09c40cd78b14ea28ed71@579561 13f79535-47bb-0310-9956-ffa450edef68

apache/spamassassin,apache/spamassassin,apache/spamassassin,apache/spamassassin,apache/spamassassin