diff options
| author | Etienne Petrel <etienne.petrel@mongodb.com> | 2022-02-25 04:58:23 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-02-25 05:27:08 +0000 |
| commit | 1284ff6c5580d59423ccc59a4f33f172d604bbc4 (patch) | |
| tree | 426604547c70117e6128b9a61ede2217cafbc1fa | |
| parent | 0b5f91715ece50d0050d407a090ad4f5134744ee (diff) | |
| download | mongo-1284ff6c5580d59423ccc59a4f33f172d604bbc4.tar.gz | |
Import wiredtiger: 074ba0f7b5f2b73de49da3ae352b83b8d33b6f80 from branch mongodb-master
ref: a69db0c7f3..074ba0f7b5
for: 6.0.0
WT-6422 Document expectation around ignore_prepare
| -rw-r--r-- | src/third_party/wiredtiger/dist/api_data.py | 5 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/wiredtiger.in | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/third_party/wiredtiger/dist/api_data.py b/src/third_party/wiredtiger/dist/api_data.py index 56c88f2d814..c748f372067 100644 --- a/src/third_party/wiredtiger/dist/api_data.py +++ b/src/third_party/wiredtiger/dist/api_data.py @@ -1733,9 +1733,8 @@ methods = { whether to ignore the updates by other prepared transactions as part of read operations of this transaction. When \c true, forces the transaction to be read-only. Use \c force to ignore prepared updates - and permit writes (which can cause lost updates unless the application - knows something about the relationship between prepared transactions - and the updates that are ignoring them)''', + and permit writes (see @ref timestamp_prepare_ignore_prepare for + more information)''', choices=['false', 'force', 'true']), Config('isolation', '', r''' the isolation level for this transaction; defaults to the diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 1991caf833b..e4908df5d70 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": "a69db0c7f3531517cc32b44ba4b6482aea7fddc4" + "commit": "074ba0f7b5f2b73de49da3ae352b83b8d33b6f80" } diff --git a/src/third_party/wiredtiger/src/include/wiredtiger.in b/src/third_party/wiredtiger/src/include/wiredtiger.in index d736f8f60dd..6616c730d5c 100644 --- a/src/third_party/wiredtiger/src/include/wiredtiger.in +++ b/src/third_party/wiredtiger/src/include/wiredtiger.in @@ -1693,10 +1693,9 @@ struct __wt_session { * @configstart{WT_SESSION.begin_transaction, see dist/api_data.py} * @config{ignore_prepare, whether to ignore the updates by other prepared transactions as * part of read operations of this transaction. When \c true\, forces the transaction to be - * read-only. Use \c force to ignore prepared updates and permit writes (which can cause - * lost updates unless the application knows something about the relationship between - * prepared transactions and the updates that are ignoring them)., a string\, chosen from - * the following options: \c "false"\, \c "force"\, \c "true"; default \c false.} + * read-only. Use \c force to ignore prepared updates and permit writes (see @ref + * timestamp_prepare_ignore_prepare for more information)., a string\, chosen from the + * following options: \c "false"\, \c "force"\, \c "true"; default \c false.} * @config{isolation, the isolation level for this transaction; defaults to the session's * isolation level., a string\, chosen from the following options: \c "read-uncommitted"\, * \c "read-committed"\, \c "snapshot"; default empty.} |