diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-08-11 14:58:04 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-08-11 14:58:04 +0200 |
| commit | cb17c4da4f07a5052a62b96a80e27867955fc8bb (patch) | |
| tree | 4bc4f04623df011e647f876127d7aba273c9f413 /src/blockchain_db | |
| parent | Merge pull request #952 (diff) | |
| parent | db_lmdb: errors dropping hf starting height db on reset are not fatal (diff) | |
| download | monero-cb17c4da4f07a5052a62b96a80e27867955fc8bb.tar.xz | |
Merge pull request #953
240864f db_lmdb: errors dropping hf starting height db on reset are not fatal (moneromooo-monero)
Diffstat (limited to 'src/blockchain_db')
| -rw-r--r-- | src/blockchain_db/lmdb/db_lmdb.cpp | 3 |
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)) |