Merge branch 'dbenv' into tmp

Conflicts: src/db.cpp
2012-05-22 17:45:00 -04:00
parent 5d0f7c4f47 ffe8b77a61
commit 0134a1c08c
5 changed files with 165 additions and 138 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1463,7 +1463,6 @@ bool static Reorganize(CTxDB& txdb, CBlockIndex* pindexNew)
        if (!block.ConnectBlock(txdb, pindex))
        {
            // Invalid block
-            txdb.TxnAbort();
            return error("Reorganize() : ConnectBlock %s failed", pindex->GetBlockHash().ToString().substr(0,20).c_str());
        }