Import wiredtiger-wiredtiger-2.6.1-1231-g10208e8.tar.gz from wiredtiger branch mongodb-3.2

5 files changed, 14 insertions, 13 deletions

diff --git a/src/third_party/wiredtiger/dist/api_data.py b/src/third_party/wiredtiger/dist/api_data.py
index 494e8f91a9a..5652edc4ebe 100644
--- a/src/third_party/wiredtiger/dist/api_data.py
+++ b/src/third_party/wiredtiger/dist/api_data.py
@@ -271,7 +271,10 @@ file_config = format_meta + [
         leaf pages''',
         min=0),
     Config('split_deepen_min_child', '0', r'''
-        minimum entries in a page to consider deepening the tree''',
+        minimum entries in a page to consider deepening the tree. Pages
+        will be considered for splitting and deepening the search tree
+        as soon as there are more than the configured number of children
+        ''',
         type='int', undoc=True),
     Config('split_deepen_per_child', '0', r'''
         entries allocated per child when deepening the tree''',
diff --git a/src/third_party/wiredtiger/dist/log.py b/src/third_party/wiredtiger/dist/log.py
index da4a9c10727..feeb053db3e 100644
--- a/src/third_party/wiredtiger/dist/log.py
+++ b/src/third_party/wiredtiger/dist/log.py
@@ -159,7 +159,8 @@ __logrec_json_unpack_str(char *dest, size_t destlen, const char *src,
 
 \ttotal = 0;
 \twhile (srclen > 0) {
-\t\tn = __wt_json_unpack_char(*src++, (u_char *)dest, destlen, 0);
+\t\tn = __wt_json_unpack_char(
+\t\t    *src++, (u_char *)dest, destlen, false);
 \t\tsrclen--;
 \t\tif (n > destlen)
 \t\t\tdestlen = 0;
diff --git a/src/third_party/wiredtiger/dist/s_define.list b/src/third_party/wiredtiger/dist/s_define.list
index 8cca4471e8b..dce284dae44 100644
--- a/src/third_party/wiredtiger/dist/s_define.list
+++ b/src/third_party/wiredtiger/dist/s_define.list
@@ -3,12 +3,8 @@ ALIGN_CHECK
 API_CALL
 API_CALL_NOCONF
 API_SESSION_INIT
-FLD_CLR
-F_CAS_ATOMIC
-F_CLR_ATOMIC
-F_SET_ATOMIC
-LF_CLR
-LF_SET
+FLD_MASK
+LF_MASK
 LLONG_MAX
 LLONG_MIN
 SIZE_CHECK
@@ -18,12 +14,10 @@ TXN_API_END
 WIN32_LEAN_AND_MEAN
 WT_ATOMIC_CAS
 WT_ATOMIC_FUNC
-WT_BARRIER
 WT_BLOCK_DESC_SIZE
 WT_CACHE_LINE_ALIGNMENT
 WT_COMPILER_TYPE_ALIGN
 WT_CONN_CHECK_PANIC
-WT_COUNTER_SLOTS
 WT_DEADLOCK
 WT_DEBUG_BYTE
 WT_ERR_ERROR_OK
@@ -40,10 +34,7 @@ WT_PACKED_STRUCT_BEGIN
 WT_PACKED_STRUCT_END
 WT_READ_BARRIER
 WT_REF_SIZE
-WT_RET_ERROR_OK
 WT_SESSION_LOCKED_CHECKPOINT
-WT_STATS_FIELD_TO_SLOT
-WT_STATS_SLOT_ID
 WT_STAT_DECR
 WT_STAT_DECRV
 WT_STAT_FAST_CONN_DECRV
@@ -53,6 +44,8 @@ WT_STAT_FAST_DECRV
 WT_STAT_FAST_INCR
 WT_STAT_FAST_INCRV
 WT_STAT_FAST_SET
+WT_STATS_FIELD_TO_SLOT
+WT_STATS_SLOT_ID
 WT_STAT_WRITE
 WT_TRET_ERROR_OK
 WT_WITH_LOCK
diff --git a/src/third_party/wiredtiger/dist/s_string.ok b/src/third_party/wiredtiger/dist/s_string.ok
index 4419662b9c4..bfc4124f74d 100644
--- a/src/third_party/wiredtiger/dist/s_string.ok
+++ b/src/third_party/wiredtiger/dist/s_string.ok
@@ -302,6 +302,7 @@ UnixLib
 Unmap
 UnmapViewOfFile
 Unmarshall
+Unordered
 Uryyb
 VARCHAR
 VLDB
@@ -967,6 +968,7 @@ unmarshall
 unmarshalled
 unmerged
 unmodify
+unordered
 unpackv
 unpadded
 unreferenced
diff --git a/src/third_party/wiredtiger/dist/stat_data.py b/src/third_party/wiredtiger/dist/stat_data.py
index accab6bb351..5bf7000f402 100644
--- a/src/third_party/wiredtiger/dist/stat_data.py
+++ b/src/third_party/wiredtiger/dist/stat_data.py
@@ -253,6 +253,8 @@ connection_stats = [
     LogStat('log_prealloc_files', 'pre-allocated log files prepared'),
     LogStat('log_prealloc_max',
         'number of pre-allocated log files to create', 'no_clear,no_scale'),
+    LogStat('log_prealloc_missed',
+        'pre-allocated log files not ready and missed'),
     LogStat('log_prealloc_used', 'pre-allocated log files used'),
     LogStat('log_release_write_lsn', 'log release advances write LSN'),
     LogStat('log_scan_records', 'records processed by log scan'),