Import wiredtiger: 74430da40c96247c0a0d92f011ccfb2b175f1f32 from branch mongodb-3.4

ref: ef9a7983ea..74430da40c
for: 3.4.0

SERVER-26753  Minor speed regression (13%) and 'choppy' performance in 3.4 vs 3.2
WT-2415       Add option for join cursors to return false positives
WT-2945       Occasional hang running reconfigure fuzz test
WT-2947       test suite populate functions need refactoring
WT-2953       Test format failure - stuck cache with 1/42MB dirty
WT-2961       Add a version drop-down to the web version of the docs
WT-2964       WTPERF parallel-pop-btree hung in populate phase
WT-2968       backup cursor opens every file
WT-2971       Add documentation for raw compression to the WT docs
WT-2975       Reduce the memory allocated for statistics
WT-2991       Coverity issue 1365198
WT-2998       Add error messages to error returns that might be confusing.
WT-2999       Memory leak in join WT_CURSOR with custom extractor
WT-3001       WT_EXTENSION_API references are named inconsistently.
WT-3003       log generation should not auto generate the record and op types
WT-3005       Add top-level .gitignore file.
WT-3007       Remove duplicated word in comment
WT-3008       Run wtperf stress testing against all maintained branches
WT-3009       Test format hung/aborted with small cache (sub 10mB)

1 files changed, 9 insertions, 9 deletions

diff --git a/src/third_party/wiredtiger/src/txn/txn_log.c b/src/third_party/wiredtiger/src/txn/txn_log.c
index f9dd9bee807..f1b78879d76 100644
--- a/src/third_party/wiredtiger/src/txn/txn_log.c
+++ b/src/third_party/wiredtiger/src/txn/txn_log.c
@@ -262,20 +262,20 @@ err:	__wt_logrec_free(session, &logrec);
  *	Read a log record for a checkpoint operation.
  */
 int
-__wt_txn_checkpoint_logread(
-    WT_SESSION_IMPL *session, const uint8_t **pp, const uint8_t *end,
-    WT_LSN *ckpt_lsn)
+__wt_txn_checkpoint_logread(WT_SESSION_IMPL *session,
+    const uint8_t **pp, const uint8_t *end, WT_LSN *ckpt_lsn)
 {
-	WT_ITEM ckpt_snapshot;
+	WT_DECL_RET;
+	WT_ITEM ckpt_snapshot_unused;
 	uint32_t ckpt_file, ckpt_offset;
-	u_int ckpt_nsnapshot;
+	u_int ckpt_nsnapshot_unused;
 	const char *fmt = WT_UNCHECKED_STRING(IIIU);
 
-	WT_RET(__wt_struct_unpack(session, *pp, WT_PTRDIFF(end, *pp), fmt,
+	if ((ret = __wt_struct_unpack(session, *pp, WT_PTRDIFF(end, *pp), fmt,
 	    &ckpt_file, &ckpt_offset,
-	    &ckpt_nsnapshot, &ckpt_snapshot));
-	WT_UNUSED(ckpt_nsnapshot);
-	WT_UNUSED(ckpt_snapshot);
+	    &ckpt_nsnapshot_unused, &ckpt_snapshot_unused)) != 0)
+		WT_RET_MSG(session,
+		    ret, "txn_checkpoint_logread: unpack failure");
 	WT_SET_LSN(ckpt_lsn, ckpt_file, ckpt_offset);
 	*pp = end;
 	return (0);