summaryrefslogtreecommitdiff
path: root/src/block
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2016-04-05 08:16:46 -0400
committerKeith Bostic <keith@wiredtiger.com>2016-04-05 08:16:46 -0400
commit1e6841db88331d8b9fe13933eec4af8f824dca9d (patch)
treef4bf17b82a45a460c2e9dd822218887f5ba6ce7d /src/block
parent5b34fb2eed8ba6f5b6e925d689ecb3413bad130a (diff)
parent466d74b84e7f347ee98074d8457b94420a8c5e95 (diff)
downloadmongo-1e6841db88331d8b9fe13933eec4af8f824dca9d.tar.gz
Merge branch 'develop' into wt-2526
Diffstat (limited to 'src/block')
-rw-r--r--src/block/block_ckpt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/block/block_ckpt.c b/src/block/block_ckpt.c
index a0aadb43b93..a861a21876b 100644
--- a/src/block/block_ckpt.c
+++ b/src/block/block_ckpt.c
@@ -135,8 +135,11 @@ __wt_block_checkpoint_load(WT_SESSION_IMPL *session, WT_BLOCK *block,
* that was done when the checkpoint was first written (re-writing the
* checkpoint might possibly make it relevant here, but it's unlikely
* enough I don't bother).
+ *
+ * If in-memory, we don't read or write the object, and the truncate
+ * will unnecessarily allocate buffer space.
*/
- if (!checkpoint) {
+ if (!checkpoint && !F_ISSET(S2C(session), WT_CONN_IN_MEMORY)) {
/*
* The truncate might fail if there's a file mapping (if there's
* an open checkpoint on the file), that's OK.