Import wiredtiger: 2e9744d11a65c63ba7445060dc78371250f04051 from branch mongodb-3.6

ref: 6173a98979..2e9744d11a
for: 3.5.11

WT-2309       Add yields and/or sleeps in #DIAGNOSTIC mode
WT-3047       Add mode aimed at uncovering race conditions in split code
WT-3308       Add statistics tracking around yield loops
WT-3316       Add new engineering section to reference guide documentation
WT-3338       Optimize cursor modify
WT-3380       Special case 8-byte timestamps
WT-3387       Add support for a stable timestamp
WT-3389       Restructure split code to hold a split generation for the entire operation.
WT-3406       Reconciliation is choosing reserved records for writing.
WT-3410       Add developer documentation for table rename
WT-3412       Add backoff logic to the btree delete and walk yield loops
WT-3418       block manager object race
WT-3422       WiredTiger upgrading documents out of date
WT-3432       workgen needs braces around an "if" body
WT-3433       session->alter method should not be supported in read-only mode
WT-3439       lint/cleanup
WT-3440       Add a log record when starting a checkpoint
WT-3442       Coverity 1378213: false positive on diagnostic assignment.
WT-3446       Temporarily disable timestamp testing in test/checkpoint
WT-3447       test_stat_log02 can assert before table stats are printed
WT-3461       Avoid long sleeps when the system clock is adjusted
WT-3463       Add recovery of backup to test_timestamp03.py
WT-3466       Track the first commit timestamp for each transaction
WT-3467       Minor lint/cleanup

3 files changed, 6 insertions, 11 deletions

diff --git a/src/third_party/wiredtiger/src/evict/evict_lru.c b/src/third_party/wiredtiger/src/evict/evict_lru.c
index 1f26949c94f..6b341a85df8 100644
--- a/src/third_party/wiredtiger/src/evict/evict_lru.c
+++ b/src/third_party/wiredtiger/src/evict/evict_lru.c
@@ -964,7 +964,7 @@ __evict_tune_workers(WT_SESSION_IMPL *session)
 	 * If we have a fixed number of eviction threads, there is no value in
 	 * calculating if we should do any tuning.
 	 */
-       if (conn->evict_threads_max == conn->evict_threads_min)
+	if (conn->evict_threads_max == conn->evict_threads_min)
 		return;
 
 	WT_ASSERT(session, conn->evict_threads.threads[0]->session == session);
@@ -1506,10 +1506,8 @@ retry:	while (slot < max_entries) {
 		goto retry;
 	}
 
-err:	if (dhandle_locked) {
+err:	if (dhandle_locked)
 		__wt_readunlock(session, &conn->dhandle_lock);
-		dhandle_locked = false;
-	}
 
 	/*
 	 * If we didn't find any entries on a walk when we weren't interrupted,
@@ -1604,7 +1602,6 @@ __evict_walk_file(WT_SESSION_IMPL *session,
 	start = queue->evict_queue + *slotp;
 	remaining_slots = max_entries - *slotp;
 	total_slots = max_entries - queue->evict_entries;
-	btree_inuse = cache_inuse = 0;
 	target_pages_clean = target_pages_dirty = 0;
 
 	/*
@@ -1813,10 +1810,8 @@ __evict_walk_file(WT_SESSION_IMPL *session,
 		}
 
 		if (ref == NULL) {
-			WT_STAT_CONN_INCR(
-			    session, cache_eviction_walks_ended);
-			WT_STAT_DATA_INCR(
-			    session, cache_eviction_walks_ended);
+			WT_STAT_CONN_INCR(session, cache_eviction_walks_ended);
+			WT_STAT_DATA_INCR(session, cache_eviction_walks_ended);
 
 			if (++restarts == 2) {
 				WT_STAT_CONN_INCR(
diff --git a/src/third_party/wiredtiger/src/evict/evict_page.c b/src/third_party/wiredtiger/src/evict/evict_page.c
index a12590dedbc..03d6e9ab503 100644
--- a/src/third_party/wiredtiger/src/evict/evict_page.c
+++ b/src/third_party/wiredtiger/src/evict/evict_page.c
@@ -597,7 +597,7 @@ __evict_review(
 	    LF_ISSET(WT_EVICT_LOOKASIDE) ||
 	    F_ISSET(S2BT(session), WT_BTREE_LOOKASIDE) ||
 	    __wt_txn_visible_all(session, page->modify->rec_max_txn,
-	    WT_TIMESTAMP(page->modify->rec_max_timestamp)));
+	    WT_TIMESTAMP_NULL(&page->modify->rec_max_timestamp)));
 
 	return (0);
 }
diff --git a/src/third_party/wiredtiger/src/evict/evict_stat.c b/src/third_party/wiredtiger/src/evict/evict_stat.c
index 63d0aff60f1..b8878f1ce2f 100644
--- a/src/third_party/wiredtiger/src/evict/evict_stat.c
+++ b/src/third_party/wiredtiger/src/evict/evict_stat.c
@@ -29,7 +29,7 @@ __evict_stat_walk(WT_SESSION_IMPL *session)
 	btree = S2BT(session);
 	cache = S2C(session)->cache;
 	next_walk = NULL;
-	dsk_size = gen_gap = gen_gap_max = gen_gap_sum = max_pagesize = 0;
+	gen_gap_max = gen_gap_sum = max_pagesize = 0;
 	num_memory = num_not_queueable = num_queued = 0;
 	num_smaller_allocsz = pages_clean = pages_dirty = pages_internal = 0;
 	pages_leaf = seen_count = size = visited_count = 0;