summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2022-03-09 14:52:34 +1100
committerLuke Chen <luke.chen@mongodb.com>2022-03-09 14:52:34 +1100
commit9f30fd5bf3f5a5a541d0cadcb486cc67181a147f (patch)
tree56c443839c7a11eeb1897cbb3b6052f941b57fbd
parentcf6ac4d17da6eb6562f503a515ea6aea2ccbf944 (diff)
downloadmongo-9f30fd5bf3f5a5a541d0cadcb486cc67181a147f.tar.gz
Import wiredtiger: 3e44a24338c041119127a05fed55808551e5d892 from branch mongodb-5.3
ref: 8f54db107d..3e44a24338 for: 5.3.0-rc4 WT-8912 Avoid rollback writes to logged tables for in-memory database
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_handle.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 3a77d155728..f9b6dfaaea5 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
"vendor": "wiredtiger",
"github": "wiredtiger/wiredtiger.git",
"branch": "mongodb-5.3",
- "commit": "8f54db107d6e3b8b32fe0d0416ae49ee397b8d39"
+ "commit": "3e44a24338c041119127a05fed55808551e5d892"
}
diff --git a/src/third_party/wiredtiger/src/btree/bt_handle.c b/src/third_party/wiredtiger/src/btree/bt_handle.c
index 327277b97f0..f592528a190 100644
--- a/src/third_party/wiredtiger/src/btree/bt_handle.c
+++ b/src/third_party/wiredtiger/src/btree/bt_handle.c
@@ -388,8 +388,8 @@ __btree_conf(WT_SESSION_IMPL *session, WT_CKPT *ckpt)
if (WT_IS_METADATA(btree->dhandle))
F_SET(btree, WT_BTREE_IGNORE_CACHE);
- F_SET(btree, WT_BTREE_NO_LOGGING);
- if (FLD_ISSET(conn->log_flags, WT_CONN_LOG_ENABLED)) {
+ F_SET(btree, WT_BTREE_NO_LOGGING); /* Timestamps apply. */
+ if (FLD_ISSET(conn->log_flags, WT_CONN_LOG_ENABLED) || F_ISSET(conn, WT_CONN_IN_MEMORY)) {
WT_RET(__wt_config_gets(session, cfg, "log.enabled", &cval));
if (cval.val)
F_CLR(btree, WT_BTREE_NO_LOGGING);