Import wiredtiger: 2bb717625d1e81e6a0abfb910ead00afdde7fe2a from branch mongodb-4.0

ref: e6c7496532..2bb717625d
for: 4.0.2

WT-3276       Add recover=salvage to recover from a corrupted log file
WT-3943       Include full error message when a python test asserts
WT-3955       Add verbose option to log more messages on error returns
WT-3963       Add a schema intensive abort testing
WT-3968       Use compression ratio to tune page sizes
WT-4010       Simplify test/format timestamp handling.
WT-4134       Rework assertion that we don't discard required history
WT-4147       Log recovery should not ignore corruption outside of log records in a log file
WT-4160       Restore performance when timestamps are not in use
WT-4168       Update upgrading documentation for 3.1.0 release
WT-4169       Fix wt verify dump-pages failure
WT-4171       Enabling tree walk timing stress causes excessive slowdown
WT-4172       Add diagnostic hazard pointer checks in more places before freeing refs
WT-4174       Do not access the lookaside file in rollback_to_stable when running with in_memory=true
WT-4178       Fixes for wt_btree_immediately_durable needed for in-memory
WT-4179       Expose WiredTiger crc32c functions
WT-4182       Use conservative approach for log checksum errors
WT-4183       Extend verbose option to log more messages on error returns
WT-4186       Log recovery should detect and report corruption within log records
WT-4187       Coverity: unused value complaints
WT-4188       Coverity: unchecked return value complaints
WT-4189       Potential infinite loop in __async_flush_wait().
WT-4191       Fix Coverity static analysis errors
WT-4195       When encountering an illegal value, log the value that failed
WT-4196       Make log corruption checking work regardless of the machine byte order
WT-4198       Some supported MongoDB architectures don't support crc32 hardware
WT-4199       Fix an incorrect report of log corruption
WT-4201       Fix Coverity static analysis issues
WT-4206       Fix error handling in cursor close routines
WT-4208       tree walks can be interrupted by locked internal pages
WT-4213       Rename lock statistics that have redundant or misleading text
WT-4226       test/format LSM configurations can misconfigure prepare and timestamps

2 files changed, 1 insertions, 2 deletions

diff --git a/src/third_party/wiredtiger/test/fops/fops.c b/src/third_party/wiredtiger/test/fops/fops.c
index 99c333be4a0..96a60acbfa5 100644
--- a/src/third_party/wiredtiger/test/fops/fops.c
+++ b/src/third_party/wiredtiger/test/fops/fops.c
@@ -69,7 +69,7 @@ fop_start(u_int nthreads)
 
 	/* Wait for the threads. */
 	for (i = 0; i < nthreads; ++i)
-		testutil_check(__wt_thread_join(NULL, tids[i]));
+		testutil_check(__wt_thread_join(NULL, &tids[i]));
 
 	(void)gettimeofday(&stop, NULL);
 	seconds = (stop.tv_sec - start.tv_sec) +
diff --git a/src/third_party/wiredtiger/test/fops/t.c b/src/third_party/wiredtiger/test/fops/t.c
index e748918a08a..d82b2c3f3f1 100644
--- a/src/third_party/wiredtiger/test/fops/t.c
+++ b/src/third_party/wiredtiger/test/fops/t.c
@@ -112,7 +112,6 @@ main(int argc, char *argv[])
 		}
 
 	argc -= __wt_optind;
-	argv += __wt_optind;
 	if (argc != 0)
 		return (usage());