Import wiredtiger: b055251678e6b4fcc74a1f651432aadbfeecc0e4 from branch mongodb-3.6

ref: 698847557c..b055251678
for: 3.5.12

WT-3328       Enhance docs around when schema operations can get EBUSY
WT-3358       LSM will hang if the manager fails to start
WT-3365       Understand how timestamps interact with LSM chunk switching
WT-3399       Add new checkpoint blocking test case to automated testing
WT-3417       Drain transactions during upgrade/downgrade.
WT-3441       test_timestamp01 doesn't account for a large WT_TIMESTAMP_SIZE
WT-3450       Add verbose option that tracks timestamp state and information
WT-3452       Enhance existing recovery test to exercise timestamp API
WT-3455       Enhance eviction to be aware of stable timestamp
WT-3459       Test WiredTiger with clock shifting
WT-3460       Add support for rollback_to_stable to column store
WT-3465       Optimize performance when timestamp size is 8 bytes
WT-3483       WT_SESSION::checkpoint returning WT_ROLLBACK
WT-3492       ex_all.c not calling transaction_ops
WT-3493       wt_verbose_dump_txn should display timestamp information
WT-3497       Improve logging message when hitting the WT session limits
WT-3498       Incorrect data read after caching overflow items
WT-3499       Checkpoint can miss not yet committed item
WT-3500       New timestamp-abort test is too chatty
WT-3502       Only keep 10 delta updates between full copies
WT-3503       Coverity 1379333: unchecked return value, full-build Friday
WT-3508       timestamp-abort bug in verification phase
WT-3509       __wt_illegal_value doesn't always provide a failure location
WT-3514       WT_SESSION.checkpoint: read timestamp 6373c older than oldest timestamp
WT-3517       WT_SESSION::reset doesn't need to call out EBUSY specially
WT-3521       Unstable updates should not be written by lookaside eviction

8 files changed, 48 insertions, 8 deletions

diff --git a/src/third_party/wiredtiger/dist/api_data.py b/src/third_party/wiredtiger/dist/api_data.py
index ee2f14b980b..37f9baedc70 100644
--- a/src/third_party/wiredtiger/dist/api_data.py
+++ b/src/third_party/wiredtiger/dist/api_data.py
@@ -402,7 +402,9 @@ connection_runtime_config = [
             min='0', max='100000'),
         ]),
     Config('compatibility', '', r'''
-        set compatibility version of database''',
+        set compatibility version of database.  Changing the compatibility
+        version requires that there are no active operations for the duration
+        of the call.''',
         type='category', subconfig=[
         Config('release', '', r'''
             compatibility release version string'''),
@@ -560,6 +562,7 @@ connection_runtime_config = [
             'split',
             'temporary',
             'thread_group',
+            'timestamp',
             'transaction',
             'verify',
             'version',
@@ -1146,9 +1149,6 @@ methods = {
     Config('name', '', r'''
         if set, specify a name for the checkpoint (note that checkpoints
         including LSM trees may not be named)'''),
-    Config('read_timestamp', '', r'''
-        if set, create the checkpoint as of the specified timestamp''',
-        undoc=True),
     Config('target', '', r'''
         if non-empty, checkpoint the list of objects''', type='list'),
     Config('use_timestamp', 'true', r'''
diff --git a/src/third_party/wiredtiger/dist/filelist b/src/third_party/wiredtiger/dist/filelist
index 33ede795c69..9755e24f3c7 100644
--- a/src/third_party/wiredtiger/dist/filelist
+++ b/src/third_party/wiredtiger/dist/filelist
@@ -72,6 +72,7 @@ src/conn/conn_dhandle.c
 src/conn/conn_handle.c
 src/conn/conn_log.c
 src/conn/conn_open.c
+src/conn/conn_reconfig.c
 src/conn/conn_stat.c
 src/conn/conn_sweep.c
 src/cursor/cur_backup.c
diff --git a/src/third_party/wiredtiger/dist/flags.py b/src/third_party/wiredtiger/dist/flags.py
index 05ffb8851a2..8c0448b27c1 100644
--- a/src/third_party/wiredtiger/dist/flags.py
+++ b/src/third_party/wiredtiger/dist/flags.py
@@ -87,6 +87,7 @@ flags = {
         'VERB_SPLIT',
         'VERB_TEMPORARY',
         'VERB_THREAD_GROUP',
+        'VERB_TIMESTAMP',
         'VERB_TRANSACTION',
         'VERB_VERIFY',
         'VERB_VERSION',
diff --git a/src/third_party/wiredtiger/dist/s_all b/src/third_party/wiredtiger/dist/s_all
index be33657e640..1809cef3aa5 100755
--- a/src/third_party/wiredtiger/dist/s_all
+++ b/src/third_party/wiredtiger/dist/s_all
@@ -88,8 +88,8 @@ COMMANDS="
 2>&1 ./s_docs > ${t_pfx}s_docs
 2>&1 ./s_export > ${t_pfx}s_export
 2>&1 ./s_funcs > ${t_pfx}s_funcs
+2>&1 ./s_function > ${t_pfx}s_function
 2>&1 ./s_getopt > ${t_pfx}s_getopt
-2>&1 ./s_label > ${t_pfx}s_label
 2>&1 ./s_lang > ${t_pfx}s_lang
 2>&1 ./s_longlines > ${t_pfx}s_longlines
 2>&1 ./s_python > ${t_pfx}s_python
diff --git a/src/third_party/wiredtiger/dist/s_copyright.list b/src/third_party/wiredtiger/dist/s_copyright.list
index 2ac63bcb159..71ffa446eed 100644
--- a/src/third_party/wiredtiger/dist/s_copyright.list
+++ b/src/third_party/wiredtiger/dist/s_copyright.list
@@ -12,7 +12,7 @@ skip	dist/flags.py
 skip	dist/java_doc.py
 skip	dist/log.py
 skip	dist/log_data.py
-skip	dist/s_label_loop.py
+skip	dist/s_function_loop.py
 skip	dist/stat.py
 skip	dist/stat_data.py
 skip	dist/style.py
diff --git a/src/third_party/wiredtiger/dist/s_label b/src/third_party/wiredtiger/dist/s_function
index c7b63d9d5b3..3259e215d0c 100755
--- a/src/third_party/wiredtiger/dist/s_label
+++ b/src/third_party/wiredtiger/dist/s_function
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Check WiredTiger error/return macros.
+# Check various WiredTiger function behaviors.
 t=__wt.$$
 trap 'rm -f $t' 0 1 2 3 13 15
 
@@ -36,7 +36,7 @@ done
 # Jumps before returns have already been detected above.
 for f in `find bench examples ext src test -name '*.[ci]'`; do
 	file_parse $f | sed "s=^=$f:="
-done | python dist/s_label_loop.py |
+done | python dist/s_function_loop.py |
     egrep '\{@[^@]*(WT_ILLEGAL_VALUE|WT_RET[_A-Z]*)\([^@]*(WT_ERR[_A-Z]*|WT_ILLEGAL_VALUE_ERR)\(.*err:' |
     sed -e 's/^\([^:]*\): *\([^:]*\):.*/\1:\2: mix of returns and jump to the error label within a loop/'
 
@@ -80,4 +80,37 @@ for f in `find bench examples ext src test -name '*.[ci]'`; do
 
 done
 
+# API_END with a return
+for f in `find bench examples ext src test -name '*.[ci]'`; do
+	file_parse $f |
+	egrep '[^A-Z_]API_END.*return' |
+	sed 's/:.*//' > $t
+	test -s $t && {
+		echo "$f: API_END followed by return."
+		sed 's/^/function @ line:/' < $t
+	}
+done
+
+# S2C with a local WT_CONNECTION_IMPL variable.
+for f in `find bench examples ext src test -name '*.[ci]'`; do
+	file_parse $f |
+	egrep 'conn = S2C.*S2C' |
+	sed 's/:.*//' > $t
+	test -s $t && {
+		echo "$f: S2C with a local WT_CONNECTION_IMPL variable."
+		sed 's/^/function @ line:/' < $t
+	}
+done
+
+# S2B with a local WT_BTREE variable.
+for f in `find bench examples ext src test -name '*.[ci]'`; do
+	file_parse $f |
+	egrep 'btree = S2B.*S2B' |
+	sed 's/:.*//' > $t
+	test -s $t && {
+		echo "$f: S2B with a local WT_BTREE variable."
+		sed 's/^/function @ line:/' < $t
+	}
+done
+
 exit 0
diff --git a/src/third_party/wiredtiger/dist/s_label_loop.py b/src/third_party/wiredtiger/dist/s_function_loop.py
index 5cc222a4250..5cc222a4250 100644
--- a/src/third_party/wiredtiger/dist/s_label_loop.py
+++ b/src/third_party/wiredtiger/dist/s_function_loop.py
diff --git a/src/third_party/wiredtiger/dist/s_string.ok b/src/third_party/wiredtiger/dist/s_string.ok
index c79dc5129a5..58b8137cad9 100644
--- a/src/third_party/wiredtiger/dist/s_string.ok
+++ b/src/third_party/wiredtiger/dist/s_string.ok
@@ -74,6 +74,7 @@ Checksum
 Checksums
 CityHash
 CloseHandle
+Cmvz
 Collet
 Comparator
 Config
@@ -264,6 +265,7 @@ NoAddr
 Noll
 Nul
 OOB
+OPLOG
 OPTYPE
 OUTBUFF
 OVFL
@@ -528,6 +530,7 @@ checkpointer
 checkpointing
 checksum
 checksums
+checksys
 checkvalue
 children's
 chk
@@ -940,6 +943,7 @@ msvc
 multi
 multiblock
 multicore
+multicycle
 multiprocess
 multisocket
 multithreaded
@@ -1284,6 +1288,7 @@ vtype
 vunpack
 vw
 vxr
+vz
 waitpid
 waker
 wakeup