Merge remote branch 'refs/remotes/svn/trunk' into svn

2010-09-13 10:46:31 -04:00 · 2010-09-13 10:46:31 -04:00 · 43e4a2a289
parent 41016bfc46 fdbf76d4f4
commit 43e4a2a289
2 changed files with 1 additions and 2 deletions
--- a/db.cpp
+++ b/db.cpp
@ -77,7 +77,6 @@ CDB::CDB(const char* pszFile, const char* pszMode) : pdb(NULL)
                             DB_INIT_MPOOL |
                             DB_INIT_TXN   |
                             DB_THREAD     |
-                             DB_PRIVATE    |
                             DB_RECOVER,
                             S_IRUSR | S_IWUSR);
            if (ret > 0)
--- a/serialize.h
+++ b/serialize.h
@ -23,7 +23,7 @@ class CAutoFile;
 static const unsigned int MAX_SIZE = 0x02000000;

 static const int VERSION = 312;
-static const char* pszSubVer = ".3";
+static const char* pszSubVer = ".4";