Import wiredtiger-wiredtiger-2.4.0-325-gb4df6ce.tar.gz from wiredtiger branch develop

3 files changed, 13 insertions, 5 deletions

diff --git a/src/third_party/wiredtiger/tools/stat_data.py b/src/third_party/wiredtiger/tools/stat_data.py
index 93d5fa813f8..56218f497b7 100644
--- a/src/third_party/wiredtiger/tools/stat_data.py
+++ b/src/third_party/wiredtiger/tools/stat_data.py
@@ -17,6 +17,10 @@ no_scale_per_second_list = [
     'session: open cursor count',
     'session: open session count',
     'transaction: transaction checkpoint currently running',
+    'transaction: transaction checkpoint max time (msecs)',
+    'transaction: transaction checkpoint min time (msecs)',
+    'transaction: transaction checkpoint most recent time (msecs)',
+    'transaction: transaction checkpoint total time (msecs)',
     'transaction: transaction range of IDs currently pinned',
     'block-manager: checkpoint size',
     'block-manager: file allocation unit size',
@@ -61,6 +65,10 @@ no_clear_list = [
     'session: open cursor count',
     'session: open session count',
     'transaction: transaction checkpoint currently running',
+    'transaction: transaction checkpoint max time (msecs)',
+    'transaction: transaction checkpoint min time (msecs)',
+    'transaction: transaction checkpoint most recent time (msecs)',
+    'transaction: transaction checkpoint total time (msecs)',
     'transaction: transaction range of IDs currently pinned',
     'session: open cursor count',
 ]
diff --git a/src/third_party/wiredtiger/tools/wt_nvd3_util.py b/src/third_party/wiredtiger/tools/wt_nvd3_util.py
index 87ce9b85e9f..fe058d25c1d 100644
--- a/src/third_party/wiredtiger/tools/wt_nvd3_util.py
+++ b/src/third_party/wiredtiger/tools/wt_nvd3_util.py
@@ -31,7 +31,7 @@ from datetime import datetime
 tool_dir = os.path.split(sys.argv[0])[0]
 # Make sure Python finds the NVD3 in our third party directory, to
 # avoid compatability issues
-sys.path.append(os.path.join(tool_dir, "third_party"))
+sys.path.append(os.path.join(tool_dir, "3rdparty"))
 
 try:
     from nvd3 import lineChart
diff --git a/src/third_party/wiredtiger/tools/wtstats.py b/src/third_party/wiredtiger/tools/wtstats.py
index 7950fd69081..882a6fb5be2 100644
--- a/src/third_party/wiredtiger/tools/wtstats.py
+++ b/src/third_party/wiredtiger/tools/wtstats.py
@@ -33,10 +33,10 @@ from subprocess import call
 
 # Make sure Python can find files in the tools directory
 tool_dir = os.path.split(sys.argv[0])[0]
-sys.path.append(tool_dir)
-# Make sure Python finds the NVD3 in our third party directory, to
-# avoid compatability issues
-sys.path.append(os.path.join(tool_dir, "third_party"))
+
+# Make sure Python finds the NVD3 in our third party directory.
+# To avoid compatability issues, prepend it to the system path.
+sys.path = [ os.path.join(tool_dir, "3rdparty") ] + sys.path
 
 try:
     from stat_data import no_scale_per_second_list, no_clear_list