Import wiredtiger: 6a31c2118cce88c68281eda2ca9ab1df915a2773 from branch mongodb-3.4

ref: fc0e7abe82..6a31c2118c
for: 3.4.0

WT-2831       Skip creating a checkpoint if there have been no changes
WT-2858       rename wtperf's CONFIG structure
WT-2895       Reduce the runtime of make check testing with disable long
WT-2907       Bug in Java ConcurrentCloseTest case
WT-2917       split wtperf's configuration into per-database and per-run parts
WT-2920       New eviction statistics
WT-2931       Configure default in-memory dirty cache usage lower
WT-2932       Allow applications to selectively ignore cache limit with in-memory configuration
WT-2933       Fix a race between named snapshots and checkpoints
WT-2937       test_inmem01 aborts due to stuck cache
WT-2938       Assembly files should end in .sx, not .S
WT-2941       Improve test/format to use faster key-generation functions
WT-2942       verbose strings don't need newline
WT-2946       dist/s_docs incompatible with OS X Xcode installation
WT-2948       simplify error handling by making epoch time return never fail
WT-2950       Inserting multi-megabyte values can cause large in-memory pages

1 files changed, 4 insertions, 5 deletions

diff --git a/src/third_party/wiredtiger/src/session/session_compact.c b/src/third_party/wiredtiger/src/session/session_compact.c
index f03d5d34bac..66635007723 100644
--- a/src/third_party/wiredtiger/src/session/session_compact.c
+++ b/src/third_party/wiredtiger/src/session/session_compact.c
@@ -179,17 +179,16 @@ __compact_handle_append(WT_SESSION_IMPL *session, const char *cfg[])
  *	Check if the timeout has been exceeded.
  */
 static int
-__session_compact_check_timeout(
-    WT_SESSION_IMPL *session, struct timespec begin)
+__session_compact_check_timeout(WT_SESSION_IMPL *session, struct timespec begin)
 {
 	struct timespec end;
 
 	if (session->compact->max_time == 0)
 		return (0);
 
-	WT_RET(__wt_epoch(session, &end));
+	__wt_epoch(session, &end);
 	if (session->compact->max_time < WT_TIMEDIFF_SEC(end, begin))
-		WT_RET(ETIMEDOUT);
+		return (ETIMEDOUT);
 	return (0);
 }
 
@@ -219,7 +218,7 @@ __compact_file(WT_SESSION_IMPL *session, const char *cfg[])
 	    session, t, "target=(\"%s\"),force=1", dhandle->name));
 	checkpoint_cfg[1] = t->data;
 
-	WT_ERR(__wt_epoch(session, &start_time));
+	__wt_epoch(session, &start_time);
 
 	/*
 	 * We compact 10% of the file on each pass (but the overall size of the