aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-08-10 10:50:17 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-08-10 10:50:17 +0100
commit240864f52945aed323c96377376155c879d7439e (patch)
treed4d7aeb38c736653732ce7d70596366cc5b4a3e3
parentMerge pull request #937 (diff)
downloadmonero-240864f52945aed323c96377376155c879d7439e.tar.xz
db_lmdb: errors dropping hf starting height db on reset are not fatal
This db is now dropped unconditionally, so may or may not be there in the first place.
-rw-r--r--src/blockchain_db/lmdb/db_lmdb.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp
index 2cd3943e9..ea97c1ab3 100644
--- a/src/blockchain_db/lmdb/db_lmdb.cpp
+++ b/src/blockchain_db/lmdb/db_lmdb.cpp
@@ -1242,8 +1242,7 @@ void BlockchainLMDB::reset()
throw0(DB_ERROR(lmdb_error("Failed to drop m_output_amounts: ", result).c_str()));
if (auto result = mdb_drop(txn, m_spent_keys, 0))
throw0(DB_ERROR(lmdb_error("Failed to drop m_spent_keys: ", result).c_str()));
- if (auto result = mdb_drop(txn, m_hf_starting_heights, 0))
- throw0(DB_ERROR(lmdb_error("Failed to drop m_hf_starting_heights: ", result).c_str()));
+ (void)mdb_drop(txn, m_hf_starting_heights, 0); // this one is dropped in new code
if (auto result = mdb_drop(txn, m_hf_versions, 0))
throw0(DB_ERROR(lmdb_error("Failed to drop m_hf_versions: ", result).c_str()));
if (auto result = mdb_drop(txn, m_properties, 0))