Import wiredtiger-wiredtiger-2.5.1-144-g3a3bda5.tar.gz from wiredtiger branch mongodb-3.0

4 files changed, 9 insertions, 3 deletions

diff --git a/src/third_party/wiredtiger/dist/flags.py b/src/third_party/wiredtiger/dist/flags.py
index a0e307debf6..f1eb6b24968 100644
--- a/src/third_party/wiredtiger/dist/flags.py
+++ b/src/third_party/wiredtiger/dist/flags.py
@@ -36,12 +36,11 @@ flags = {
     'page_read' : [
         'READ_CACHE',
         'READ_COMPACT',
-        'READ_NO_GEN',
         'READ_NO_EVICT',
+        'READ_NO_GEN',
         'READ_NO_WAIT',
         'READ_PREV',
         'READ_SKIP_INTL',
-        'READ_SKIP_LEAF',
         'READ_TRUNCATE',
         'READ_WONT_NEED',
     ],
@@ -88,15 +87,16 @@ flags = {
     'conn' : [
         'CONN_CACHE_POOL',
         'CONN_CKPT_SYNC',
+        'CONN_CLOSING',
         'CONN_EVICTION_RUN',
         'CONN_LEAK_MEMORY',
         'CONN_LOG_SERVER_RUN',
         'CONN_LSM_MERGE',
         'CONN_PANIC',
-        'CONN_SERVER_RUN',
         'CONN_SERVER_ASYNC',
         'CONN_SERVER_CHECKPOINT',
         'CONN_SERVER_LSM',
+        'CONN_SERVER_RUN',
         'CONN_SERVER_STATISTICS',
         'CONN_SERVER_SWEEP',
         'CONN_WAS_BACKUP',
diff --git a/src/third_party/wiredtiger/dist/s_define.list b/src/third_party/wiredtiger/dist/s_define.list
index 91fbc971afa..4924a1935ae 100644
--- a/src/third_party/wiredtiger/dist/s_define.list
+++ b/src/third_party/wiredtiger/dist/s_define.list
@@ -49,6 +49,7 @@ WT_STAT_ATOMIC_DECR
 WT_STAT_ATOMIC_DECRV
 WT_STAT_ATOMIC_INCR
 WT_STAT_ATOMIC_INCRV
+WT_STAT_DECR
 WT_STAT_DECRV
 WT_STAT_FAST_ATOMIC_DECR
 WT_STAT_FAST_ATOMIC_DECRV
diff --git a/src/third_party/wiredtiger/dist/s_string.ok b/src/third_party/wiredtiger/dist/s_string.ok
index 66439faf161..8b0335a6480 100644
--- a/src/third_party/wiredtiger/dist/s_string.ok
+++ b/src/third_party/wiredtiger/dist/s_string.ok
@@ -551,6 +551,7 @@ dest
 dev
 dhandle
 dhandles
+dir
 dirlist
 dl
 dlclose
@@ -1161,6 +1162,7 @@ wrapup
 writelock
 writeunlock
 wrlock
+wrlsn
 ws
 wti
 wtperf
diff --git a/src/third_party/wiredtiger/dist/stat_data.py b/src/third_party/wiredtiger/dist/stat_data.py
index 5a42f2ff318..dd4d292c8b6 100644
--- a/src/third_party/wiredtiger/dist/stat_data.py
+++ b/src/third_party/wiredtiger/dist/stat_data.py
@@ -221,11 +221,14 @@ connection_stats = [
     LogStat('log_prealloc_max', 'number of pre-allocated log files to create'),
     LogStat('log_prealloc_used', 'pre-allocated log files used'),
     LogStat('log_reads', 'log read operations'),
+    LogStat('log_release_write_lsn', 'log release advances write LSN'),
     LogStat('log_scan_records', 'records processed by log scan'),
     LogStat('log_scan_rereads', 'log scan records requiring two reads'),
     LogStat('log_scans', 'log scan operations'),
     LogStat('log_sync', 'log sync operations'),
+    LogStat('log_sync_dir', 'log sync_dir operations'),
     LogStat('log_writes', 'log write operations'),
+    LogStat('log_write_lsn', 'log server thread advances write LSN'),
 
     LogStat('log_slot_consolidated', 'logging bytes consolidated'),
     LogStat('log_slot_closes', 'consolidated slot closures'),