Import wiredtiger: 40e3225e55ffbf0c9819af138fa4a014c0639c72 from branch mongodb-4.2

ref: 9b85ad8968..40e3225e55
for: 4.3.1

WT-4477       Add eviction debug mode and extra checks
WT-4494       Support import of of standalone WiredTiger files
WT-4580       Abort transactions that perform updates with ignore_prepare=true
WT-4719       Non-zero update count detected when committing prepared transaction
WT-4787       Coverity: Potential infinite loops
WT-4790       Coverity: Memory leak within __wt_curbulk_init
WT-4827       Apply commit timestamps when a truncated page is read
WT-4829       File names are generated incorrectly in operation tracking scripts
WT-4837       Disabled cache during verify
WT-4839       Add a feature to python testsuite to run a random subset of tests
WT-4844       Only log an informational message when a set read-timestamp is older than the oldest timestamp
WT-4848       Fix perf regression when calculating differences
WT-4850       Fix __slvg_checkpoint() metadata memory leak
WT-4851       heap-use-after-free when block manager grows buffer during final checkpoint
WT-4852       Evergreen runs of test/format require shared library extensions
WT-4853       Standalone recovery code cannot handle deleted checkpoints
WT-4854       wt utility list command has a memory leak and minor error handling bugs
WT-4855       WiredTiger recovery should detect files without unique IDs
WT-4859       Fix test/format program path issue for endian tests

1 files changed, 5 insertions, 8 deletions

diff --git a/src/third_party/wiredtiger/src/include/txn.h b/src/third_party/wiredtiger/src/include/txn.h
index 29ad33f3b76..2a514629006 100644
--- a/src/third_party/wiredtiger/src/include/txn.h
+++ b/src/third_party/wiredtiger/src/include/txn.h
@@ -242,6 +242,11 @@ struct __wt_txn_op {
 			} mode;
 		} truncate_row;
 	} u;
+
+/* AUTOMATIC FLAG VALUE GENERATION START */
+#define	WT_TXN_OP_KEY_REPEATED	0x1u
+/* AUTOMATIC FLAG VALUE GENERATION STOP */
+	uint32_t flags;
 };
 
 /*
@@ -305,14 +310,6 @@ struct __wt_txn {
 	WT_TXN_OP      *mod;
 	size_t		mod_alloc;
 	u_int		mod_count;
-#ifdef HAVE_DIAGNOSTIC
-	/*
-	 * Reference count of multiple updates processed, as part of a single
-	 * transaction operation processing for resolving the indirect update
-	 * references in a prepared transaction as part of commit.
-	 */
-	u_int		multi_update_count;
-#endif
 
 	/* Scratch buffer for in-memory log records. */
 	WT_ITEM	       *logrec;