diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-02-17 17:10:07 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-02-17 17:10:07 +0200 |
| commit | c0698147739080cf2b9e8e58197d552dc94b7ecc (patch) | |
| tree | a8b79cf5f7e32cfeaa76fa3104c7d0918585b123 /src/blockchain_db/berkeleydb/db_bdb.cpp | |
| parent | Merge pull request #671 (diff) | |
| parent | Shutup about VERSION 0 (diff) | |
| download | monero-c0698147739080cf2b9e8e58197d552dc94b7ecc.tar.xz | |
Merge pull request #672
3b13a74 Shutup about VERSION 0 (Howard Chu)
1537477 Use cursor in get_output_key (Howard Chu)
f2faf8c Use MDB_APPEND mode where possible (Howard Chu)
090b548 Use cursors in write txns (Howard Chu)
ed08d21 Keep a running blocksize count (Howard Chu)
0fc9334 Win32 import batchsize tweaks (Howard Chu)
Diffstat (limited to 'src/blockchain_db/berkeleydb/db_bdb.cpp')
| -rw-r--r-- | src/blockchain_db/berkeleydb/db_bdb.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/blockchain_db/berkeleydb/db_bdb.cpp b/src/blockchain_db/berkeleydb/db_bdb.cpp index cdbca52f9..f035bf4c4 100644 --- a/src/blockchain_db/berkeleydb/db_bdb.cpp +++ b/src/blockchain_db/berkeleydb/db_bdb.cpp @@ -947,10 +947,12 @@ void BlockchainBDB::open(const std::string& filename, const int db_flags) LOG_PRINT_RED_L0("Existing BerkeleyDB database was made by a later version. We don't know how it will change yet."); compatible = false; } - else if (VERSION > 0 && result < VERSION) +#if VERSION > 0 + else if (result < VERSION) { compatible = false; } +#endif } else { |