summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEtienne Petrel <etienne.petrel@mongodb.com>2022-04-28 00:34:02 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-04-28 03:35:01 +0000
commit30260c79d9e09dee6c68637f87db6c4bdf16cbfe (patch)
tree78a684ede17b85edf638e4ef1091fa9068128576 /src
parent3d97739f505124dce4682be7dd07f6c0e3079ce9 (diff)
downloadmongo-30260c79d9e09dee6c68637f87db6c4bdf16cbfe.tar.gz
Import wiredtiger: 77b525f40021c118b3dafdbfd58167c2bcf7da38 from branch mongodb-master
ref: fc005cf9a1..77b525f400 for: 6.1.0-rc0 WT-9205 Correct transaction warning text in documentation
Diffstat (limited to 'src')
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/docs/transactions_api.dox2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 55150c388c2..5151c35a335 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-master",
- "commit": "fc005cf9a1c5727fb92a931c7e4166b746c4f4c6"
+ "commit": "77b525f40021c118b3dafdbfd58167c2bcf7da38"
}
diff --git a/src/third_party/wiredtiger/src/docs/transactions_api.dox b/src/third_party/wiredtiger/src/docs/transactions_api.dox
index 84b4fb20894..3ccf2776fea 100644
--- a/src/third_party/wiredtiger/src/docs/transactions_api.dox
+++ b/src/third_party/wiredtiger/src/docs/transactions_api.dox
@@ -70,7 +70,7 @@ allocated to hold the data required to satisfy transactional readers, operations
may fail and return ::WT_ROLLBACK.
\warning
-A thread with active transactions should avoid pausing or blocking. This may delay
+A thread with an active transaction should avoid pausing or blocking. This may delay
other transactions that require the same resources, leading to performance problems that
are hard to diagnose.