diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-04 11:44:44 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-04 11:45:33 +0100 |
| commit | aca0c00ae1fcd4ddaadf7a35765f763a7bc4b946 (patch) | |
| tree | 0bc5bbb7fefb099f7c1802d7cbf09d75a14df573 /src/wallet | |
| parent | 42f339ef780bff268369e3a7399c8b8f2ef3e8b4 (diff) | |
| parent | a6efc019085fd70790ad7fa97078ce02d8f8dec3 (diff) | |
| download | bitcoin-aca0c00ae1fcd4ddaadf7a35765f763a7bc4b946.tar.xz | |
Merge pull request #6905
a6efc01 Bugfix: Omit wallet-related options from -help when wallet is disabled (Luke Dashjr)
5f9260f Bugfix: If genproclimit is omitted to RPC setgenerate, don't change it; also show correct default in getmininginfo (Luke Dashjr)
420a82f Bugfix: Describe dblogsize option correctly (it refers to the wallet database, not memory pool) (Luke Dashjr)
caa3d42 Bugfix: RPC: blockchain: Display correct defaults in help for verifychain method (Luke Dashjr)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/db.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/db.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index e5bc653c33..cf6122813c 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -293,7 +293,7 @@ void CDB::Flush() if (fReadOnly) nMinutes = 1; - bitdb.dbenv->txn_checkpoint(nMinutes ? GetArg("-dblogsize", 100) * 1024 : 0, nMinutes, 0); + bitdb.dbenv->txn_checkpoint(nMinutes ? GetArg("-dblogsize", DEFAULT_WALLET_DBLOGSIZE) * 1024 : 0, nMinutes, 0); } void CDB::Close() diff --git a/src/wallet/db.h b/src/wallet/db.h index 64071caa3a..46bc0ac0a9 100644 --- a/src/wallet/db.h +++ b/src/wallet/db.h @@ -20,6 +20,8 @@ #include <db_cxx.h> +static const unsigned int DEFAULT_WALLET_DBLOGSIZE = 100; + extern unsigned int nWalletDBUpdated; class CDBEnv |