Import wiredtiger: 569c70d13a7b3da0fe8eb1bac06a86865cb36a7c from branch mongodb-3.4

ref: 7d3c0f9f50..569c70d13a
for: 3.3.13

SERVER-25843  Coverity analysis defect 99856: Redundant test
SERVER-25845  Coverity analysis defect 99859: Explicit null dereferenced
SERVER-25846  Coverity analysis defect 99861: Dereference after null check
WT-2221       Document which statistics are available via a "fast" configuration vs. an "all" configuration
WT-2233       Investigate changing when the eviction server switches to aggressive mode.
WT-2323       Allocate a transaction id at the beginning of join cursor iteration
WT-2555       make format run on Windows
WT-2788       Java: freed memory overwrite during handle close can cause JNI crash
WT-2816       Improve WiredTiger eviction performance
WT-2824       wtperf displays connection and table create configurations twice
WT-2842       split wtperf's configuration into per-database and per-run parts
WT-2866       Eviction server algorithm tuning
WT-2867       Review and fix barrier usage in __lsm_tree_close
WT-2870       Rename wtperf checkpoint schema jobs
WT-2871       __wt_verbose has the wrong GCC format attributes
WT-2872       Recent stuck cache test/stress failures.
WT-2873       Refactor CRC32 code
WT-2875       Test test_wt2853_perf can run too long under valgrind
WT-2876       Extend wtperf to support a log like table
WT-2878       Verbose changes affected performance
WT-2881       Add -Wpedantic to clang compiler warning flags
WT-2882       Add CRC32 hardware scons detection, disable CRC hardware support on ARM for now
WT-2883       wiredtiger_open with verbose=handleops recursive loop
WT-2885       __wt_checkpoint_signal lint
WT-2886       Decide how in-memory configuration and eviction_dirty_target interact
WT-2888       Switch functions to return void where possible
WT-2892       hot backup can race with block truncate
WT-2896       Coverity #1362535: resource leak
WT-2897       Checkpoints can become corrupted on failure
WT-2901       Add option to disable checkpoint dirty stepdown phase

1 files changed, 7 insertions, 7 deletions

diff --git a/src/third_party/wiredtiger/src/btree/bt_io.c b/src/third_party/wiredtiger/src/btree/bt_io.c
index 6c2e2f1b3fb..8053417f838 100644
--- a/src/third_party/wiredtiger/src/btree/bt_io.c
+++ b/src/third_party/wiredtiger/src/btree/bt_io.c
@@ -182,7 +182,7 @@ __wt_bt_write(WT_SESSION_IMPL *session, WT_ITEM *buf,
 	size_t dst_len, len, result_len, size, src_len;
 	int compression_failed;		/* Extension API, so not a bool. */
 	uint8_t *dst, *src;
-	bool data_cksum, encrypted;
+	bool data_checksum, encrypted;
 
 	btree = S2BT(session);
 	bm = btree->bm;
@@ -344,24 +344,24 @@ __wt_bt_write(WT_SESSION_IMPL *session, WT_ITEM *buf,
 	 * Checksum the data if the buffer isn't compressed or checksums are
 	 * configured.
 	 */
-	data_cksum = true;		/* -Werror=maybe-uninitialized */
+	data_checksum = true;		/* -Werror=maybe-uninitialized */
 	switch (btree->checksum) {
 	case CKSUM_ON:
-		data_cksum = true;
+		data_checksum = true;
 		break;
 	case CKSUM_OFF:
-		data_cksum = false;
+		data_checksum = false;
 		break;
 	case CKSUM_UNCOMPRESSED:
-		data_cksum = !compressed;
+		data_checksum = !compressed;
 		break;
 	}
 
 	/* Call the block manager to write the block. */
 	WT_ERR(checkpoint ?
-	    bm->checkpoint(bm, session, ip, btree->ckpt, data_cksum) :
+	    bm->checkpoint(bm, session, ip, btree->ckpt, data_checksum) :
 	    bm->write(
-	    bm, session, ip, addr, addr_sizep, data_cksum, checkpoint_io));
+	    bm, session, ip, addr, addr_sizep, data_checksum, checkpoint_io));
 
 	WT_STAT_FAST_CONN_INCR(session, cache_write);
 	WT_STAT_FAST_DATA_INCR(session, cache_write);