aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-09-29 22:16:15 +0200
committerRiccardo Spagni <ric@spagni.net>2016-09-29 22:16:15 +0200
commit995dde4f950ced36a9630c6754e9b9e9fe261b3d (patch)
tree1f1a1e93db5b94586c1362ee2bc1edd3426b23bf /src
parentMerge pull request #1129 (diff)
parentdb_lmdb: do not error if dropping a non existent hard fork table (diff)
downloadmonero-995dde4f950ced36a9630c6754e9b9e9fe261b3d.tar.xz
Merge pull request #1128
d2e11f3 db_lmdb: do not error if dropping a non existent hard fork table (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/blockchain_db/lmdb/db_lmdb.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp
index 21ed8f4da..acb7d2cf6 100644
--- a/src/blockchain_db/lmdb/db_lmdb.cpp
+++ b/src/blockchain_db/lmdb/db_lmdb.cpp
@@ -1132,7 +1132,7 @@ void BlockchainLMDB::open(const std::string& filename, const int mdb_flags)
if (!(mdb_flags & MDB_RDONLY))
{
result = mdb_drop(txn, m_hf_starting_heights, 1);
- if (result)
+ if (result && result != MDB_NOTFOUND)
throw0(DB_ERROR(lmdb_error("Failed to drop m_hf_starting_heights: ", result).c_str()));
}