Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master

26 files changed, 776 insertions, 395 deletions

diff --git a/lang/csharp/src/Internal/DB.cs b/lang/csharp/src/Internal/DB.cs
index f95a7a4b..9e9a09a9 100644
--- a/lang/csharp/src/Internal/DB.cs
+++ b/lang/csharp/src/Internal/DB.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -34,6 +34,14 @@ internal class DB : IDisposable {
     }
 } 
 
+	internal DatabaseEntry[] get_partition_keys() {
+		uint count = 0;
+		int err = 0;
+		uint size = 0;
+		DatabaseEntry[] ret = get_partition_keys(ref count, ref size, ref err);
+		DatabaseException.ThrowException(err);
+		return ret;
+	}
 	internal DBC cursor(DB_TXN txn, uint flags) {
 		int err = 0;
 		DBC ret = cursor(txn, flags, ref err);
@@ -81,6 +89,22 @@ internal class DB : IDisposable {
 		return ret;
 	}
 	
+	internal int get_blob_dir(out string dir) {
+		int ret;
+		IntPtr dirp;
+		ret = get_blob_dir(out dirp);
+		dir = Marshal.PtrToStringAnsi(dirp);
+		return ret;
+	}
+	
+	internal int get_blob_sub_dir(out string dir) {
+		int ret;
+		IntPtr dirp;
+		ret = get_blob_sub_dir(out dirp);
+		dir = Marshal.PtrToStringAnsi(dirp);
+		return ret;
+	}
+	
 	internal int get_dbname(out string filenamep, out string dbnamep) {
 		int ret;
 		IntPtr fp, dp;
@@ -318,6 +342,41 @@ internal class DB : IDisposable {
 		return ret;
 }
 
+  internal int get_blob_dir(out IntPtr dir) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_get_blob_dir(swigCPtr, out dir);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
+  internal int set_blob_dir(string dir) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_set_blob_dir(swigCPtr, dir);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
+  internal int get_blob_sub_dir(out IntPtr dir) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_get_blob_sub_dir(swigCPtr, out dir);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
+  internal int get_blob_threshold(ref uint bytes) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_get_blob_threshold(swigCPtr, ref bytes);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
+  internal int set_blob_threshold(uint bytes, uint flags) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_set_blob_threshold(swigCPtr, bytes, flags);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
   internal int set_bt_compare(BDB_CompareDelegate callback) {
 		int ret;
 		ret = libdb_csharpPINVOKE.DB_set_bt_compare(swigCPtr, callback);
@@ -525,6 +584,45 @@ internal class DB : IDisposable {
 		return ret;
 }
 
+  internal void set_msgcall(BDB_MsgcallDelegate db_msgcall_fcn) {
+    libdb_csharpPINVOKE.DB_set_msgcall(swigCPtr, db_msgcall_fcn);
+  }
+
+  internal int set_msgfile(string msgfile) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_set_msgfile(swigCPtr, msgfile);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
+  private DatabaseEntry[] get_partition_keys(ref uint countp, ref uint sizep, ref int err) {
+	IntPtr cPtr = libdb_csharpPINVOKE.DB_get_partition_keys(swigCPtr, ref countp, ref sizep, ref err);
+	if (cPtr == IntPtr.Zero)
+		return null;
+
+	DatabaseEntry[] ret = new DatabaseEntry[countp - 1];
+	IntPtr val;
+	for (int i = 0; i < (countp - 1); i++) {
+		val = new IntPtr((IntPtr.Size == 4 ? cPtr.ToInt32() : cPtr.ToInt64()) + i * sizep);
+		ret[i] = DatabaseEntry.fromDBT(new DBT(val, false));
+	}
+	return ret; 
+}
+
+  internal int get_partition_parts(ref uint parts) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_get_partition_parts(swigCPtr, ref parts);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
+  internal int set_partition(uint parts, IntPtr[] keys, BDB_PartitionDelegate partition) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_set_partition(swigCPtr, parts, keys, partition);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
   internal int get_priority(ref uint flags) {
 		int ret;
 		ret = libdb_csharpPINVOKE.DB_get_priority(swigCPtr, ref flags);
diff --git a/lang/csharp/src/Internal/DBC.cs b/lang/csharp/src/Internal/DBC.cs
index 25ed7ee4..c32d5453 100644
--- a/lang/csharp/src/Internal/DBC.cs
+++ b/lang/csharp/src/Internal/DBC.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -47,6 +47,12 @@ internal class DBC : IDisposable {
 		DatabaseException.ThrowException(err);
 		return ret;
 	}
+	internal DB_STREAM db_stream(uint flags) {
+		int err = 0;
+		DB_STREAM ret = db_stream(flags, ref err);
+		DatabaseException.ThrowException(err);
+		return ret;
+	}
 
   internal int close() {
 		int ret = libdb_csharpPINVOKE.DBC_close(swigCPtr);
@@ -72,6 +78,12 @@ internal class DBC : IDisposable {
 		return ret;
 }
 
+  private DB_STREAM db_stream(uint flags, ref int err) {
+    IntPtr cPtr = libdb_csharpPINVOKE.DBC_db_stream(swigCPtr, flags, ref err);
+    DB_STREAM ret = (cPtr == IntPtr.Zero) ? null : new DB_STREAM(cPtr, false);
+    return ret;
+  }
+
   internal int del(uint flags) {
 		int ret;
 		ret = libdb_csharpPINVOKE.DBC_del(swigCPtr, flags);
diff --git a/lang/csharp/src/Internal/DBT.cs b/lang/csharp/src/Internal/DBT.cs
index 025fa268..116fc457 100644
--- a/lang/csharp/src/Internal/DBT.cs
+++ b/lang/csharp/src/Internal/DBT.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DBTYPE.cs b/lang/csharp/src/Internal/DBTYPE.cs
index c3910f18..a2a257d8 100644
--- a/lang/csharp/src/Internal/DBTYPE.cs
+++ b/lang/csharp/src/Internal/DBTYPE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DB_CHANNEL.cs b/lang/csharp/src/Internal/DB_CHANNEL.cs
index e1fafc5d..b1d8abd3 100644
--- a/lang/csharp/src/Internal/DB_CHANNEL.cs
+++ b/lang/csharp/src/Internal/DB_CHANNEL.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DB_COMPACT.cs b/lang/csharp/src/Internal/DB_COMPACT.cs
index 636ad761..e1ef45b0 100644
--- a/lang/csharp/src/Internal/DB_COMPACT.cs
+++ b/lang/csharp/src/Internal/DB_COMPACT.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DB_ENV.cs b/lang/csharp/src/Internal/DB_ENV.cs
index 4f3811f2..056e36b7 100644
--- a/lang/csharp/src/Internal/DB_ENV.cs
+++ b/lang/csharp/src/Internal/DB_ENV.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -214,6 +214,13 @@ internal class DB_ENV : IDisposable {
         
 		return ret;
 	}
+	internal int get_blob_dir(out string dir) {
+		int ret;
+		IntPtr dirp;
+		ret = get_blob_dir(out dirp);
+		dir = Marshal.PtrToStringAnsi(dirp);
+		return ret;
+	}
 	internal int get_home(out string file) {
 		int ret;
 		IntPtr fp;
@@ -645,6 +652,20 @@ internal class DB_ENV : IDisposable {
 		return ret;
 }
 
+  internal int repmgr_get_incoming_queue_max(ref uint gbytes, ref uint bytes) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_ENV_repmgr_get_incoming_queue_max(swigCPtr, ref gbytes, ref bytes);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
+  internal int repmgr_set_incoming_queue_max(uint gbytes, uint bytes) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_ENV_repmgr_set_incoming_queue_max(swigCPtr, gbytes, bytes);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
   internal DB_CHANNEL repmgr_channel(int eid, uint flags, ref int err) {
     IntPtr cPtr = libdb_csharpPINVOKE.DB_ENV_repmgr_channel(swigCPtr, eid, flags, ref err);
     DB_CHANNEL ret = (cPtr == IntPtr.Zero) ? null : new DB_CHANNEL(cPtr, false);
@@ -873,6 +894,13 @@ internal class DB_ENV : IDisposable {
 		return ret;
 }
 
+  internal int rep_set_view(BDB_ReplicationViewDelegate f_repview) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_ENV_rep_set_view(swigCPtr, f_repview);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
   internal int set_backup_callbacks(BDB_BackupOpenDelegate open_func, BDB_BackupWriteDelegate write_func, BDB_BackupCloseDelegate close_func) {
 		int ret;
 		ret = libdb_csharpPINVOKE.DB_ENV_set_backup_callbacks(swigCPtr, open_func, write_func, close_func);
@@ -894,6 +922,34 @@ internal class DB_ENV : IDisposable {
 		return ret;
 }
 
+  internal int get_blob_dir(out IntPtr dirp) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_ENV_get_blob_dir(swigCPtr, out dirp);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
+  internal int set_blob_dir(string dir) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_ENV_set_blob_dir(swigCPtr, dir);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
+  internal int get_blob_threshold(ref uint bytes) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_ENV_get_blob_threshold(swigCPtr, ref bytes);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
+  internal int set_blob_threshold(uint bytes, uint flags) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_ENV_set_blob_threshold(swigCPtr, bytes, flags);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
   internal int get_cachesize(ref uint gbytes, ref uint bytes, ref int ncache) {
 		int ret;
 		ret = libdb_csharpPINVOKE.DB_ENV_get_cachesize(swigCPtr, ref gbytes, ref bytes, ref ncache);
@@ -997,7 +1053,7 @@ internal class DB_ENV : IDisposable {
 		return ret;
 }
 
-  internal int get_intermediate_dir_mode(out IntPtr mode) {
+  private int get_intermediate_dir_mode(out IntPtr mode) {
 		int ret;
 		ret = libdb_csharpPINVOKE.DB_ENV_get_intermediate_dir_mode(swigCPtr, out mode);
 		DatabaseException.ThrowException(ret);
@@ -1284,6 +1340,17 @@ internal class DB_ENV : IDisposable {
 		return ret;
 }
 
+  internal void set_msgcall(BDB_MsgcallDelegate db_msgcall_fcn) {
+    libdb_csharpPINVOKE.DB_ENV_set_msgcall(swigCPtr, db_msgcall_fcn);
+  }
+
+  internal int set_msgfile(string msgfile) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_ENV_set_msgfile(swigCPtr, msgfile);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
   internal int get_thread_count(ref uint count) {
 		int ret;
 		ret = libdb_csharpPINVOKE.DB_ENV_get_thread_count(swigCPtr, ref count);
diff --git a/lang/csharp/src/Internal/DB_KEY_RANGE.cs b/lang/csharp/src/Internal/DB_KEY_RANGE.cs
index 7e5d3b92..5e172ea3 100644
--- a/lang/csharp/src/Internal/DB_KEY_RANGE.cs
+++ b/lang/csharp/src/Internal/DB_KEY_RANGE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DB_LOCK.cs b/lang/csharp/src/Internal/DB_LOCK.cs
index aa28d042..78911404 100644
--- a/lang/csharp/src/Internal/DB_LOCK.cs
+++ b/lang/csharp/src/Internal/DB_LOCK.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DB_LOCKREQ.cs b/lang/csharp/src/Internal/DB_LOCKREQ.cs
index 2137b220..a8d65455 100644
--- a/lang/csharp/src/Internal/DB_LOCKREQ.cs
+++ b/lang/csharp/src/Internal/DB_LOCKREQ.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DB_LSN.cs b/lang/csharp/src/Internal/DB_LSN.cs
index 640d7e45..375c1135 100644
--- a/lang/csharp/src/Internal/DB_LSN.cs
+++ b/lang/csharp/src/Internal/DB_LSN.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DB_PREPLIST.cs b/lang/csharp/src/Internal/DB_PREPLIST.cs
index 5d474776..75018852 100644
--- a/lang/csharp/src/Internal/DB_PREPLIST.cs
+++ b/lang/csharp/src/Internal/DB_PREPLIST.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DB_REPMGR_SITE.cs b/lang/csharp/src/Internal/DB_REPMGR_SITE.cs
index 3794330a..522b2c71 100644
--- a/lang/csharp/src/Internal/DB_REPMGR_SITE.cs
+++ b/lang/csharp/src/Internal/DB_REPMGR_SITE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DB_SEQUENCE.cs b/lang/csharp/src/Internal/DB_SEQUENCE.cs
index a1756680..6702d6ae 100644
--- a/lang/csharp/src/Internal/DB_SEQUENCE.cs
+++ b/lang/csharp/src/Internal/DB_SEQUENCE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -56,7 +56,7 @@ internal class DB_SEQUENCE : IDisposable {
 		return ret;
 }
 
-  internal int get(DB_TXN txn, int delta, ref Int64 retp, uint flags) {
+  internal int get(DB_TXN txn, uint delta, ref Int64 retp, uint flags) {
 		int ret;
 		ret = libdb_csharpPINVOKE.DB_SEQUENCE_get(swigCPtr, DB_TXN.getCPtr(txn), delta, ref retp, flags);
 		DatabaseException.ThrowException(ret);
@@ -112,14 +112,14 @@ internal class DB_SEQUENCE : IDisposable {
 	return ret;
 }
 
-  internal int get_cachesize(ref int size) {
+  internal int get_cachesize(ref uint size) {
 		int ret;
 		ret = libdb_csharpPINVOKE.DB_SEQUENCE_get_cachesize(swigCPtr, ref size);
 		DatabaseException.ThrowException(ret);
 		return ret;
 }
 
-  internal int set_cachesize(int size) {
+  internal int set_cachesize(uint size) {
 		int ret;
 		ret = libdb_csharpPINVOKE.DB_SEQUENCE_set_cachesize(swigCPtr, size);
 		DatabaseException.ThrowException(ret);
diff --git a/lang/csharp/src/Internal/DB_SITE.cs b/lang/csharp/src/Internal/DB_SITE.cs
index afa008bd..ca896da5 100644
--- a/lang/csharp/src/Internal/DB_SITE.cs
+++ b/lang/csharp/src/Internal/DB_SITE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DB_STREAM.cs b/lang/csharp/src/Internal/DB_STREAM.cs
new file mode 100644
index 00000000..fef9da68
--- /dev/null
+++ b/lang/csharp/src/Internal/DB_STREAM.cs
@@ -0,0 +1,88 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 2.0.12
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+namespace BerkeleyDB.Internal {
+
+using System;
+using System.Runtime.InteropServices;
+
+internal class DB_STREAM : IDisposable {
+  private HandleRef swigCPtr;
+  protected bool swigCMemOwn;
+
+  internal DB_STREAM(IntPtr cPtr, bool cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  internal static HandleRef getCPtr(DB_STREAM obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+
+  ~DB_STREAM() {
+    Dispose();
+  }
+
+  public virtual void Dispose() {
+    lock(this) {
+      if (swigCPtr.Handle != IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          libdb_csharpPINVOKE.delete_DB_STREAM(swigCPtr);
+        }
+        swigCPtr = new HandleRef(null, IntPtr.Zero);
+      }
+      GC.SuppressFinalize(this);
+    }
+  }
+
+  internal int close(uint flags) {
+		int ret = libdb_csharpPINVOKE.DB_STREAM_close(swigCPtr, flags);
+		if (ret == 0)
+			/* Close is a db handle destructor.  Reflect that in the wrapper class. */
+			swigCPtr = new HandleRef(null, IntPtr.Zero);
+		else
+			DatabaseException.ThrowException(ret);
+		return ret;
+}
+
+  internal int read(DatabaseEntry data, Int64 offset, uint size, uint flags) {
+    try {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_STREAM_read(swigCPtr, DBT.getCPtr(DatabaseEntry.getDBT(data)), offset, size, flags);
+		DatabaseException.ThrowException(ret);
+		return ret;
+} finally {
+      GC.KeepAlive(data);
+    }
+  }
+
+  internal int size(ref Int64 size, uint flags) {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_STREAM_size(swigCPtr, ref size, flags);
+		DatabaseException.ThrowException(ret);
+		return ret;
+}
+
+  internal int write(DatabaseEntry data, Int64 offset, uint flags) {
+    try {
+		int ret;
+		ret = libdb_csharpPINVOKE.DB_STREAM_write(swigCPtr, DBT.getCPtr(DatabaseEntry.getDBT(data)), offset, flags);
+		DatabaseException.ThrowException(ret);
+		return ret;
+} finally {
+      GC.KeepAlive(data);
+    }
+  }
+
+  internal DB_STREAM() : this(libdb_csharpPINVOKE.new_DB_STREAM(), true) {
+  }
+
+}
+
+}
diff --git a/lang/csharp/src/Internal/DB_TXN.cs b/lang/csharp/src/Internal/DB_TXN.cs
index a74eaf8a..4ad60894 100644
--- a/lang/csharp/src/Internal/DB_TXN.cs
+++ b/lang/csharp/src/Internal/DB_TXN.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DB_TXN_TOKEN.cs b/lang/csharp/src/Internal/DB_TXN_TOKEN.cs
index 6e0a1064..0fa0bfaa 100644
--- a/lang/csharp/src/Internal/DB_TXN_TOKEN.cs
+++ b/lang/csharp/src/Internal/DB_TXN_TOKEN.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/DbConstants.cs b/lang/csharp/src/Internal/DbConstants.cs
index 988323dc..8bc47961 100644
--- a/lang/csharp/src/Internal/DbConstants.cs
+++ b/lang/csharp/src/Internal/DbConstants.cs
@@ -33,15 +33,16 @@ namespace BerkeleyDB.Internal {
         internal const uint DB_CREATE = 0x00000001;
         internal const uint DB_CURRENT = 6;
         internal const uint DB_CURSOR_BULK = 0x00000001;
-        internal const uint DB_DBT_APPMALLOC = 0x001;
-        internal const uint DB_DBT_BULK = 0x002;
-        internal const uint DB_DBT_MALLOC = 0x010;
-        internal const uint DB_DBT_MULTIPLE = 0x020;
-        internal const uint DB_DBT_PARTIAL = 0x040;
-        internal const uint DB_DBT_READONLY = 0x100;
-        internal const uint DB_DBT_REALLOC = 0x080;
-        internal const uint DB_DBT_USERCOPY = 0x400;
-        internal const uint DB_DBT_USERMEM = 0x800;
+        internal const uint DB_DBT_APPMALLOC = 0x0001;
+        internal const uint DB_DBT_BLOB = 0x1000;
+        internal const uint DB_DBT_BULK = 0x0002;
+        internal const uint DB_DBT_MALLOC = 0x0010;
+        internal const uint DB_DBT_MULTIPLE = 0x0020;
+        internal const uint DB_DBT_PARTIAL = 0x0040;
+        internal const uint DB_DBT_READONLY = 0x0100;
+        internal const uint DB_DBT_REALLOC = 0x0080;
+        internal const uint DB_DBT_USERCOPY = 0x0400;
+        internal const uint DB_DBT_USERMEM = 0x0800;
         internal const uint DB_DIRECT_DB = 0x00000200;
         internal const int DB_DONOTINDEX = -30998;
         internal const uint DB_DSYNC_DB = 0x00000400;
@@ -53,30 +54,33 @@ namespace BerkeleyDB.Internal {
         internal const uint DB_ENCRYPT = 0x00000001;
         internal const uint DB_ENCRYPT_AES = 0x00000001;
         internal const uint DB_EVENT_PANIC = 0;
-        internal const uint DB_EVENT_REP_CLIENT = 3;
-        internal const uint DB_EVENT_REP_CONNECT_BROKEN = 4;
-        internal const uint DB_EVENT_REP_CONNECT_ESTD = 5;
-        internal const uint DB_EVENT_REP_CONNECT_TRY_FAILED = 6;
-        internal const uint DB_EVENT_REP_DUPMASTER = 7;
-        internal const uint DB_EVENT_REP_ELECTED = 8;
-        internal const uint DB_EVENT_REP_ELECTION_FAILED = 9;
-        internal const uint DB_EVENT_REP_INIT_DONE = 10;
-        internal const uint DB_EVENT_REP_JOIN_FAILURE = 11;
-        internal const uint DB_EVENT_REP_LOCAL_SITE_REMOVED = 12;
-        internal const uint DB_EVENT_REP_MASTER = 13;
-        internal const uint DB_EVENT_REP_MASTER_FAILURE = 14;
-        internal const uint DB_EVENT_REP_NEWMASTER = 15;
-        internal const uint DB_EVENT_REP_PERM_FAILED = 16;
-        internal const uint DB_EVENT_REP_SITE_ADDED = 17;
-        internal const uint DB_EVENT_REP_SITE_REMOVED = 18;
-        internal const uint DB_EVENT_REP_STARTUPDONE = 19;
-        internal const uint DB_EVENT_WRITE_FAILED = 21;
+        internal const uint DB_EVENT_REP_AUTOTAKEOVER_FAILED = 3;
+        internal const uint DB_EVENT_REP_CLIENT = 4;
+        internal const uint DB_EVENT_REP_CONNECT_BROKEN = 5;
+        internal const uint DB_EVENT_REP_CONNECT_ESTD = 6;
+        internal const uint DB_EVENT_REP_CONNECT_TRY_FAILED = 7;
+        internal const uint DB_EVENT_REP_DUPMASTER = 8;
+        internal const uint DB_EVENT_REP_ELECTED = 9;
+        internal const uint DB_EVENT_REP_ELECTION_FAILED = 10;
+        internal const uint DB_EVENT_REP_INIT_DONE = 11;
+        internal const uint DB_EVENT_REP_INQUEUE_FULL = 12;
+        internal const uint DB_EVENT_REP_JOIN_FAILURE = 13;
+        internal const uint DB_EVENT_REP_LOCAL_SITE_REMOVED = 14;
+        internal const uint DB_EVENT_REP_MASTER = 15;
+        internal const uint DB_EVENT_REP_MASTER_FAILURE = 16;
+        internal const uint DB_EVENT_REP_NEWMASTER = 17;
+        internal const uint DB_EVENT_REP_PERM_FAILED = 18;
+        internal const uint DB_EVENT_REP_SITE_ADDED = 19;
+        internal const uint DB_EVENT_REP_SITE_REMOVED = 20;
+        internal const uint DB_EVENT_REP_STARTUPDONE = 21;
+        internal const uint DB_EVENT_WRITE_FAILED = 23;
         internal const uint DB_EXCL = 0x00000004;
         internal const uint DB_FAST_STAT = 0x00000001;
         internal const uint DB_FIRST = 7;
         internal const uint DB_FLUSH = 0x00000002;
         internal const uint DB_FORCE = 0x00000001;
         internal const uint DB_FORCESYNC = 0x00000001;
+        internal const uint DB_FORCESYNCENV = 0x00000002;
         internal const uint DB_FOREIGN_ABORT = 0x00000001;
         internal const uint DB_FOREIGN_CASCADE = 0x00000002;
         internal const int DB_FOREIGN_CONFLICT = -30997;
@@ -136,17 +140,20 @@ namespace BerkeleyDB.Internal {
         internal const uint DB_LOCK_WRITE = 2;
         internal const uint DB_LOCK_YOUNGEST = 9;
         internal const uint DB_LOG_AUTO_REMOVE = 0x00000001;
+        internal const uint DB_LOG_BLOB = 0x00000002;
         internal const int DB_LOG_BUFFER_FULL = -30991;
-        internal const uint DB_LOG_DIRECT = 0x00000002;
-        internal const uint DB_LOG_DSYNC = 0x00000004;
-        internal const uint DB_LOG_IN_MEMORY = 0x00000008;
-        internal const uint DB_LOG_ZERO = 0x00000010;
+        internal const uint DB_LOG_DIRECT = 0x00000004;
+        internal const uint DB_LOG_DSYNC = 0x00000008;
+        internal const uint DB_LOG_IN_MEMORY = 0x00000010;
+        internal const uint DB_LOG_NOSYNC = 0x00000020;
+        internal const uint DB_LOG_ZERO = 0x00000040;
         internal const uint DB_MEM_LOCK = 1;
         internal const uint DB_MEM_LOCKOBJECT = 2;
         internal const uint DB_MEM_LOCKER = 3;
         internal const uint DB_MEM_LOGID = 4;
         internal const uint DB_MEM_TRANSACTION = 5;
         internal const uint DB_MEM_THREAD = 6;
+        internal const int DB_META_CHKSUM_FAIL = -30968;
         internal const uint DB_MPOOL_NOFILE = 0x00000001;
         internal const uint DB_MPOOL_UNLINK = 0x00000002;
         internal const uint DB_MULTIPLE = 0x00000800;
@@ -202,20 +209,24 @@ namespace BerkeleyDB.Internal {
         internal const int DB_REPMGR_ACKS_QUORUM = 7;
         internal const uint DB_REPMGR_CONF_2SITE_STRICT = 0x00000001;
         internal const uint DB_REPMGR_CONF_ELECTIONS = 0x00000002;
+        internal const uint DB_REPMGR_CONF_PREFMAS_CLIENT = 0x00000004;
+        internal const uint DB_REPMGR_CONF_PREFMAS_MASTER = 0x00000008;
         internal const uint DB_REPMGR_CONNECTED = 1;
         internal const uint DB_REPMGR_DISCONNECTED = 2;
         internal const uint DB_REPMGR_NEED_RESPONSE = 0x00000001;
+        internal const uint DB_REPMGR_ISPEER = 0x01;
+        internal const uint DB_REPMGR_ISVIEW = 0x02;
         internal const uint DB_REPMGR_PEER = 0x00000010;
         internal const int DB_REP_ACK_TIMEOUT = 1;
         internal const uint DB_REP_ANYWHERE = 0x00000001;
         internal const int DB_REP_CHECKPOINT_DELAY = 2;
         internal const uint DB_REP_CLIENT = 0x00000001;
-        internal const uint DB_REP_CONF_AUTOINIT = 0x00000004;
-        internal const uint DB_REP_CONF_BULK = 0x00000010;
-        internal const uint DB_REP_CONF_DELAYCLIENT = 0x00000020;
-        internal const uint DB_REP_CONF_INMEM = 0x00000040;
-        internal const uint DB_REP_CONF_LEASE = 0x00000080;
-        internal const uint DB_REP_CONF_NOWAIT = 0x00000100;
+        internal const uint DB_REP_CONF_AUTOINIT = 0x00000010;
+        internal const uint DB_REP_CONF_BULK = 0x00000040;
+        internal const uint DB_REP_CONF_DELAYCLIENT = 0x00000080;
+        internal const uint DB_REP_CONF_INMEM = 0x00000200;
+        internal const uint DB_REP_CONF_LEASE = 0x00000400;
+        internal const uint DB_REP_CONF_NOWAIT = 0x00000800;
         internal const int DB_REP_CONNECTION_RETRY = 3;
         internal const uint DB_REP_DEFAULT_PRIORITY = 100;
         internal const int DB_REP_DUPMASTER = -30985;
@@ -255,6 +266,7 @@ namespace BerkeleyDB.Internal {
         internal const uint DB_SET_TXN_TIMEOUT = 0x00000002;
         internal const uint DB_SNAPSHOT = 0x00000200;
         internal const uint DB_STAT_ALL = 0x00000004;
+        internal const uint DB_STAT_ALLOC = 0x00000008;
         internal const uint DB_STAT_CLEAR = 0x00000001;
         internal const uint DB_STAT_LOCK_CONF = 0x00000010;
         internal const uint DB_STAT_LOCK_LOCKERS = 0x00000020;
@@ -262,11 +274,14 @@ namespace BerkeleyDB.Internal {
         internal const uint DB_STAT_LOCK_PARAMS = 0x00000080;
         internal const uint DB_STAT_MEMP_HASH = 0x00000010;
         internal const uint DB_STAT_SUBSYSTEM = 0x00000002;
+        internal const uint DB_STREAM_READ = 0x00000001;
+        internal const uint DB_STREAM_SYNC_WRITE = 0x00000004;
+        internal const uint DB_STREAM_WRITE = 0x00000002;
         internal const uint DB_SYSTEM_MEM = 0x00080000;
         internal const uint DB_THREAD = 0x00000020;
         internal const int DB_TIMEOUT = -30971;
         internal const uint DB_TIME_NOTGRANTED = 0x00040000;
-        internal const uint DB_TRUNCATE = 0x00020000;
+        internal const uint DB_TRUNCATE = 0x00040000;
         internal const uint DB_TXN_ABORT = 0;
         internal const uint DB_TXN_APPLY = 1;
         internal const uint DB_TXN_BACKWARD_ROLL = 3;
@@ -289,34 +304,34 @@ namespace BerkeleyDB.Internal {
         internal const uint DB_VERB_DEADLOCK = 0x00000002;
         internal const uint DB_VERB_FILEOPS = 0x00000004;
         internal const uint DB_VERB_FILEOPS_ALL = 0x00000008;
-        internal const uint DB_VERB_RECOVERY = 0x00000010;
-        internal const uint DB_VERB_REGISTER = 0x00000020;
-        internal const uint DB_VERB_REPLICATION = 0x00000040;
-        internal const uint DB_VERB_REPMGR_CONNFAIL = 0x00000080;
-        internal const uint DB_VERB_REPMGR_MISC = 0x00000100;
-        internal const uint DB_VERB_REP_ELECT = 0x00000200;
-        internal const uint DB_VERB_REP_LEASE = 0x00000400;
-        internal const uint DB_VERB_REP_MISC = 0x00000800;
-        internal const uint DB_VERB_REP_MSGS = 0x00001000;
-        internal const uint DB_VERB_REP_SYNC = 0x00002000;
-        internal const uint DB_VERB_REP_SYSTEM = 0x00004000;
-        internal const uint DB_VERB_REP_TEST = 0x00008000;
-        internal const uint DB_VERB_WAITSFOR = 0x00010000;
+        internal const uint DB_VERB_RECOVERY = 0x00000020;
+        internal const uint DB_VERB_REGISTER = 0x00000040;
+        internal const uint DB_VERB_REPLICATION = 0x00000080;
+        internal const uint DB_VERB_REPMGR_CONNFAIL = 0x00000100;
+        internal const uint DB_VERB_REPMGR_MISC = 0x00000200;
+        internal const uint DB_VERB_REP_ELECT = 0x00000400;
+        internal const uint DB_VERB_REP_LEASE = 0x00000800;
+        internal const uint DB_VERB_REP_MISC = 0x00001000;
+        internal const uint DB_VERB_REP_MSGS = 0x00002000;
+        internal const uint DB_VERB_REP_SYNC = 0x00004000;
+        internal const uint DB_VERB_REP_SYSTEM = 0x00008000;
+        internal const uint DB_VERB_REP_TEST = 0x00010000;
+        internal const uint DB_VERB_WAITSFOR = 0x00020000;
         internal const uint DB_VERIFY = 0x00000002;
         internal const int DB_VERIFY_BAD = -30970;
-        internal const uint DB_VERSION_FAMILY = 11;
-        internal const string DB_VERSION_FAMILY_STR = "11";
-        internal const uint DB_VERSION_RELEASE = 2;
-        internal const string DB_VERSION_RELEASE_STR = "2";
-        internal const uint DB_VERSION_MAJOR = 5;
-        internal const string DB_VERSION_MAJOR_STR = "5";
-        internal const uint DB_VERSION_MINOR = 3;
-        internal const string DB_VERSION_MINOR_STR = "3";
+        internal const uint DB_VERSION_FAMILY = 12;
+        internal const string DB_VERSION_FAMILY_STR = "12";
+        internal const uint DB_VERSION_RELEASE = 1;
+        internal const string DB_VERSION_RELEASE_STR = "1";
+        internal const uint DB_VERSION_MAJOR = 6;
+        internal const string DB_VERSION_MAJOR_STR = "6";
+        internal const uint DB_VERSION_MINOR = 1;
+        internal const string DB_VERSION_MINOR_STR = "1";
         internal const int DB_VERSION_MISMATCH = -30969;
-        internal const uint DB_VERSION_PATCH = 21;
-        internal const string DB_VERSION_PATCH_STR = "21";
-        internal const string DB_VERSION_STRING = "Berkeley DB 5.3.21: May 11 2012 ";
-        internal const string DB_VERSION_FULL_STRING = "Berkeley DB 11g Release 2 library version 11.2.5.3.21: May 11 2012 ";
+        internal const uint DB_VERSION_PATCH = 23;
+        internal const string DB_VERSION_PATCH_STR = "23";
+        internal const string DB_VERSION_STRING = "Berkeley DB 6.1.23: February 17 2015 ";
+        internal const string DB_VERSION_FULL_STRING = "Berkeley DB 12c Release 1 library version 12.1.6.1.23: February 17 2015 ";
         internal const uint DB_WRITECURSOR = 0x00000010;
         internal const uint DB_YIELDCPU = 0x00080000;
         internal const uint DB_USERCOPY_GETDATA = 0x00000001;
diff --git a/lang/csharp/src/Internal/Delegates.cs b/lang/csharp/src/Internal/Delegates.cs
index 0b9593ed..30861de3 100644
--- a/lang/csharp/src/Internal/Delegates.cs
+++ b/lang/csharp/src/Internal/Delegates.cs
@@ -17,7 +17,7 @@ namespace BerkeleyDB.Internal {
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     internal delegate int BDB_BackupWriteDelegate(IntPtr dbenv, uint off_gbytes, uint off_bytes, uint size, IntPtr buf, IntPtr handle);
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    internal delegate int BDB_CompareDelegate(IntPtr db, IntPtr dbt1, IntPtr dbt2);
+    internal delegate int BDB_CompareDelegate(IntPtr db, IntPtr dbt1, IntPtr dbt2, IntPtr locp);
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     internal delegate uint BDB_PrefixCompareDelegate(IntPtr db, IntPtr dbt1, IntPtr dbt2);
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
@@ -41,6 +41,12 @@ namespace BerkeleyDB.Internal {
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     internal delegate void BDB_MessageDispatchDelegate(IntPtr dbenv, IntPtr channel, IntPtr request, uint nrequest, uint cb_flags);
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    internal delegate void BDB_MsgcallDelegate(IntPtr env, string msg);
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    internal delegate int BDB_ReplicationViewDelegate(IntPtr dbenv, string name, ref int result, uint flags);
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    internal delegate uint BDB_PartitionDelegate(IntPtr db, IntPtr key);
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     internal delegate int BDB_RepTransportDelegate(IntPtr dbenv, IntPtr control, IntPtr rec, IntPtr lsnp, int envid, uint flags);
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     internal delegate void BDB_ThreadIDDelegate(IntPtr dbenv, IntPtr pid, IntPtr tid);
diff --git a/lang/csharp/src/Internal/StatStructs.cs b/lang/csharp/src/Internal/StatStructs.cs
index 18730dd3..78a75916 100644
--- a/lang/csharp/src/Internal/StatStructs.cs
+++ b/lang/csharp/src/Internal/StatStructs.cs
@@ -3,7 +3,7 @@
  *
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2002, 2012 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2002, 2015 Oracle and/or its affiliates.  All rights reserved.
  */
 
 using System;
@@ -12,204 +12,212 @@ using System.Runtime.InteropServices;
 namespace BerkeleyDB.Internal {
     [StructLayout(LayoutKind.Sequential)]
     internal struct BTreeStatStruct {
-	internal uint bt_magic;		
-	internal uint bt_version;		
-	internal uint bt_metaflags;		
-	internal uint bt_nkeys;		
-	internal uint bt_ndata;		
-	internal uint bt_pagecnt;		
-	internal uint bt_pagesize;		
-	internal uint bt_minkey;		
-	internal uint bt_re_len;		
-	internal uint bt_re_pad;		
-	internal uint bt_levels;		
-	internal uint bt_int_pg;		
-	internal uint bt_leaf_pg;		
-	internal uint bt_dup_pg;		
-	internal uint bt_over_pg;		
-	internal uint bt_empty_pg;		
-	internal uint bt_free;		
-	internal ulong bt_int_pgfree;	
-	internal ulong bt_leaf_pgfree;	
-	internal ulong bt_dup_pgfree;	
-	internal ulong bt_over_pgfree;	
+	internal uint bt_magic;
+	internal uint bt_version;
+	internal uint bt_metaflags;
+	internal uint bt_nkeys;
+	internal uint bt_ndata;
+	internal uint bt_pagecnt;
+	internal uint bt_pagesize;
+	internal uint bt_minkey;
+	internal uint bt_nblobs;
+	internal uint bt_re_len;
+	internal uint bt_re_pad;
+	internal uint bt_levels;
+	internal uint bt_int_pg;
+	internal uint bt_leaf_pg;
+	internal uint bt_dup_pg;
+	internal uint bt_over_pg;
+	internal uint bt_empty_pg;
+	internal uint bt_free;
+	internal ulong bt_int_pgfree;
+	internal ulong bt_leaf_pgfree;
+	internal ulong bt_dup_pgfree;
+	internal ulong bt_over_pgfree;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct HashStatStruct {
-	internal uint hash_magic;		
-	internal uint hash_version;		
-	internal uint hash_metaflags;	
-	internal uint hash_nkeys;		
-	internal uint hash_ndata;		
-	internal uint hash_pagecnt;		
-	internal uint hash_pagesize;	
-	internal uint hash_ffactor;		
-	internal uint hash_buckets;		
-	internal uint hash_free;		
-	internal ulong hash_bfree;		
-	internal uint hash_bigpages;	
-	internal ulong hash_big_bfree;	
-	internal uint hash_overflows;	
-	internal ulong hash_ovfl_free;	
-	internal uint hash_dup;		
-	internal ulong hash_dup_free;	
+	internal uint hash_magic;
+	internal uint hash_version;
+	internal uint hash_metaflags;
+	internal uint hash_nkeys;
+	internal uint hash_ndata;
+	internal uint hash_nblobs;
+	internal uint hash_pagecnt;
+	internal uint hash_pagesize;
+	internal uint hash_ffactor;
+	internal uint hash_buckets;
+	internal uint hash_free;
+	internal ulong hash_bfree;
+	internal uint hash_bigpages;
+	internal ulong hash_big_bfree;
+	internal uint hash_overflows;
+	internal ulong hash_ovfl_free;
+	internal uint hash_dup;
+	internal ulong hash_dup_free;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct HeapStatStruct {
-	internal uint heap_magic;		
-	internal uint heap_version;		
-	internal uint heap_metaflags;	
-	internal uint heap_nrecs;		
-	internal uint heap_pagecnt;		
-	internal uint heap_pagesize;	
-	internal uint heap_nregions;	
-	internal uint heap_regionsize;	
+	internal uint heap_magic;
+	internal uint heap_version;
+	internal uint heap_metaflags;
+	internal uint heap_nblobs;
+	internal uint heap_nrecs;
+	internal uint heap_pagecnt;
+	internal uint heap_pagesize;
+	internal uint heap_nregions;
+	internal uint heap_regionsize;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct LockStatStruct {
-	internal uint st_id;		
-	internal uint st_cur_maxid;		
-	internal uint st_initlocks;		
-	internal uint st_initlockers;	
-	internal uint st_initobjects;	
-	internal uint st_locks;		
-	internal uint st_lockers;		
-	internal uint st_objects;		
-	internal uint st_maxlocks;		
-	internal uint st_maxlockers;	
-	internal uint st_maxobjects;	
-	internal uint st_partitions;	
-	internal uint st_tablesize;		
-	internal int   st_nmodes;		
-	internal uint st_nlockers;		
-	internal uint st_nlocks;		
-	internal uint st_maxnlocks;		
-	internal uint st_maxhlocks;		
-	internal ulong st_locksteals;	
-	internal ulong st_maxlsteals;	
-	internal uint st_maxnlockers;	
-	internal uint st_nobjects;		
-	internal uint st_maxnobjects;	
-	internal uint st_maxhobjects;	
-	internal ulong st_objectsteals;	
-	internal ulong st_maxosteals;	
-	internal ulong st_nrequests;		
-	internal ulong st_nreleases;		
-	internal ulong st_nupgrade;		
-	internal ulong st_ndowngrade;	
-	internal ulong st_lock_wait;		
-	internal ulong st_lock_nowait;	
-	internal ulong st_ndeadlocks;	
-	internal uint st_locktimeout;	
-	internal ulong st_nlocktimeouts;	
-	internal uint st_txntimeout;	
-	internal ulong st_ntxntimeouts;	
-	internal ulong st_part_wait;		
-	internal ulong st_part_nowait;	
-	internal ulong st_part_max_wait;	
-	internal ulong st_part_max_nowait;	
-	internal ulong st_objs_wait;	
-	internal ulong st_objs_nowait;	
-	internal ulong st_lockers_wait;	
-	internal ulong st_lockers_nowait;	
-	internal ulong st_region_wait;	
-	internal ulong st_region_nowait;	
-	internal uint st_hash_len;		
-	internal IntPtr	  st_regsize;		
+	internal uint st_id;
+	internal uint st_cur_maxid;
+	internal uint st_initlocks;
+	internal uint st_initlockers;
+	internal uint st_initobjects;
+	internal uint st_locks;
+	internal uint st_lockers;
+	internal uint st_objects;
+	internal uint st_maxlocks;
+	internal uint st_maxlockers;
+	internal uint st_maxobjects;
+	internal uint st_partitions;
+	internal uint st_tablesize;
+	internal int   st_nmodes;
+	internal uint st_nlockers;
+	internal uint st_nlocks;
+	internal uint st_maxnlocks;
+	internal uint st_maxhlocks;
+	internal ulong st_locksteals;
+	internal ulong st_maxlsteals;
+	internal uint st_maxnlockers;
+	internal uint st_nobjects;
+	internal uint st_maxnobjects;
+	internal uint st_maxhobjects;
+	internal ulong st_objectsteals;
+	internal ulong st_maxosteals;
+	internal ulong st_nrequests;
+	internal ulong st_nreleases;
+	internal ulong st_nupgrade;
+	internal ulong st_ndowngrade;
+	internal ulong st_lock_wait;
+	internal ulong st_lock_nowait;
+	internal ulong st_ndeadlocks;
+	internal uint st_locktimeout;
+	internal ulong st_nlocktimeouts;
+	internal uint st_txntimeout;
+	internal ulong st_ntxntimeouts;
+	internal ulong st_part_wait;
+	internal ulong st_part_nowait;
+	internal ulong st_part_max_wait;
+	internal ulong st_part_max_nowait;
+	internal ulong st_objs_wait;
+	internal ulong st_objs_nowait;
+	internal ulong st_lockers_wait;
+	internal ulong st_lockers_nowait;
+	internal ulong st_region_wait;
+	internal ulong st_region_nowait;
+	internal ulong st_nlockers_hit;
+	internal ulong st_nlockers_reused;
+	internal uint st_hash_len;
+	internal IntPtr	  st_regsize;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct LogStatStruct {
-	internal uint st_magic;		
-	internal uint st_version;		
-	internal int   st_mode;		
-	internal uint st_lg_bsize;		
-	internal uint st_lg_size;		
-	internal uint st_wc_bytes;		
-	internal uint st_wc_mbytes;		
-	internal uint st_fileid_init;	
-	internal uint st_nfileid;		
-	internal uint st_maxnfileid;	
-	internal ulong st_record;		
-	internal uint st_w_bytes;		
-	internal uint st_w_mbytes;		
-	internal ulong st_wcount;		
-	internal ulong st_wcount_fill;	
-	internal ulong st_rcount;		
-	internal ulong st_scount;		
-	internal ulong st_region_wait;	
-	internal ulong st_region_nowait;	
-	internal uint st_cur_file;		
-	internal uint st_cur_offset;	
-	internal uint st_disk_file;		
-	internal uint st_disk_offset;	
-	internal uint st_maxcommitperflush;	
-	internal uint st_mincommitperflush;	
-	internal IntPtr	  st_regsize;		
+	internal uint st_magic;
+	internal uint st_version;
+	internal int   st_mode;
+	internal uint st_lg_bsize;
+	internal uint st_lg_size;
+	internal uint st_wc_bytes;
+	internal uint st_wc_mbytes;
+	internal uint st_fileid_init;
+	internal uint st_nfileid;
+	internal uint st_maxnfileid;
+	internal ulong st_record;
+	internal uint st_w_bytes;
+	internal uint st_w_mbytes;
+	internal ulong st_wcount;
+	internal ulong st_wcount_fill;
+	internal ulong st_rcount;
+	internal ulong st_scount;
+	internal ulong st_region_wait;
+	internal ulong st_region_nowait;
+	internal uint st_cur_file;
+	internal uint st_cur_offset;
+	internal uint st_disk_file;
+	internal uint st_disk_offset;
+	internal uint st_maxcommitperflush;
+	internal uint st_mincommitperflush;
+	internal IntPtr	  st_regsize;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct MPoolFileStatStruct {
-	internal uint st_pagesize;		
-	internal uint st_map;		
-	internal ulong st_cache_hit;	
-	internal ulong st_cache_miss;	
-	internal ulong st_page_create;	
-	internal ulong st_page_in;		
-	internal ulong st_page_out;		
-	internal ulong st_backup_spins;	
-	internal string file_name;	
+	internal uint st_pagesize;
+	internal uint st_map;
+	internal ulong st_cache_hit;
+	internal ulong st_cache_miss;
+	internal ulong st_page_create;
+	internal ulong st_page_in;
+	internal ulong st_page_out;
+	internal ulong st_backup_spins;
+	internal string file_name;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct MPoolStatStruct {
-	internal uint st_gbytes;		
-	internal uint st_bytes;		
-	internal uint st_ncache;		
-	internal uint st_max_ncache;	
-	internal IntPtr st_mmapsize;		
-	internal int st_maxopenfd;		
-	internal int st_maxwrite;		
-	internal uint st_maxwrite_sleep;	
-	internal uint st_pages;		
-	internal uint st_map;		
-	internal ulong st_cache_hit;	
-	internal ulong st_cache_miss;	
-	internal ulong st_page_create;	
-	internal ulong st_page_in;		
-	internal ulong st_page_out;		
-	internal ulong st_ro_evict;		
-	internal ulong st_rw_evict;		
-	internal ulong st_page_trickle;	
-	internal uint st_page_clean;	
-	internal uint st_page_dirty;	
-	internal uint st_hash_buckets;	
-	internal uint st_hash_mutexes;	
-	internal uint st_pagesize;		
-	internal uint st_hash_searches;	
-	internal uint st_hash_longest;	
-	internal ulong st_hash_examined;	
-	internal ulong st_hash_nowait;	
-	internal ulong st_hash_wait;		
-	internal ulong st_hash_max_nowait;	
-	internal ulong st_hash_max_wait;	
-	internal ulong st_region_nowait;	
-	internal ulong st_region_wait;	
-	internal ulong st_mvcc_frozen;	
-	internal ulong st_mvcc_thawed;	
-	internal ulong st_mvcc_freed;	
-	internal ulong st_alloc;		
-	internal ulong st_alloc_buckets;	
+	internal uint st_gbytes;
+	internal uint st_bytes;
+	internal uint st_ncache;
+	internal uint st_max_ncache;
+	internal IntPtr st_mmapsize;
+	internal int st_maxopenfd;
+	internal int st_maxwrite;
+	internal uint st_maxwrite_sleep;
+	internal uint st_pages;
+	internal uint st_map;
+	internal ulong st_cache_hit;
+	internal ulong st_cache_miss;
+	internal ulong st_page_create;
+	internal ulong st_page_in;
+	internal ulong st_page_out;
+	internal ulong st_ro_evict;
+	internal ulong st_rw_evict;
+	internal ulong st_page_trickle;
+	internal uint st_page_clean;
+	internal uint st_page_dirty;
+	internal uint st_hash_buckets;
+	internal uint st_hash_mutexes;
+	internal uint st_pagesize;
+	internal uint st_hash_searches;
+	internal uint st_hash_longest;
+	internal ulong st_hash_examined;
+	internal ulong st_hash_nowait;
+	internal ulong st_hash_wait;
+	internal ulong st_hash_max_nowait;
+	internal ulong st_hash_max_wait;
+	internal ulong st_region_nowait;
+	internal ulong st_region_wait;
+	internal ulong st_mvcc_frozen;
+	internal ulong st_mvcc_thawed;
+	internal ulong st_mvcc_freed;
+	internal ulong st_mvcc_reused;
+	internal ulong st_alloc;
+	internal ulong st_alloc_buckets;
 	internal ulong st_alloc_max_buckets;
-	internal ulong st_alloc_pages;	
-	internal ulong st_alloc_max_pages;	
-	internal ulong st_io_wait;		
-	internal ulong st_sync_interrupted;	
-	internal IntPtr	  st_regsize;		
-	internal IntPtr	  st_regmax;		
+	internal ulong st_alloc_pages;
+	internal ulong st_alloc_max_pages;
+	internal ulong st_io_wait;
+	internal ulong st_sync_interrupted;
+	internal uint st_oddfsize_detect;
+	internal uint st_oddfsize_resolve;
+	internal IntPtr	  st_regsize;
+	internal IntPtr	  st_regmax;
     }
 
     internal struct MempStatStruct {
@@ -220,73 +228,81 @@ namespace BerkeleyDB.Internal {
     [StructLayout(LayoutKind.Sequential)]
     internal struct MutexStatStruct {
 	
-	internal uint st_mutex_align;	
-	internal uint st_mutex_tas_spins;	
-	internal uint st_mutex_init;	
-	internal uint st_mutex_cnt;		
-	internal uint st_mutex_max;		
-	internal uint st_mutex_free;	
-	internal uint st_mutex_inuse;	
-	internal uint st_mutex_inuse_max;	
+	internal uint st_mutex_align;
+	internal uint st_mutex_tas_spins;
+	internal uint st_mutex_init;
+	internal uint st_mutex_cnt;
+	internal uint st_mutex_max;
+	internal uint st_mutex_free;
+	internal uint st_mutex_inuse;
+	internal uint st_mutex_inuse_max;
 
 	
-	internal ulong st_region_wait;	
-	internal ulong st_region_nowait;	
-	internal IntPtr	  st_regsize;		
-	internal IntPtr	  st_regmax;		
+	internal ulong st_region_wait;
+	internal ulong st_region_nowait;
+	internal IntPtr	  st_regsize;
+	internal IntPtr	  st_regmax;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct QueueStatStruct {
-	internal uint qs_magic;		
-	internal uint qs_version;		
-	internal uint qs_metaflags;		
-	internal uint qs_nkeys;		
-	internal uint qs_ndata;		
-	internal uint qs_pagesize;		
-	internal uint qs_extentsize;	
-	internal uint qs_pages;		
-	internal uint qs_re_len;		
-	internal uint qs_re_pad;		
-	internal uint qs_pgfree;		
-	internal uint qs_first_recno;	
-	internal uint qs_cur_recno;		
+	internal uint qs_magic;
+	internal uint qs_version;
+	internal uint qs_metaflags;
+	internal uint qs_nkeys;
+	internal uint qs_ndata;
+	internal uint qs_pagesize;
+	internal uint qs_extentsize;
+	internal uint qs_pages;
+	internal uint qs_re_len;
+	internal uint qs_re_pad;
+	internal uint qs_pgfree;
+	internal uint qs_first_recno;
+	internal uint qs_cur_recno;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct RecnoStatStruct {
-	internal uint bt_magic;		
-	internal uint bt_version;		
-	internal uint bt_metaflags;		
-	internal uint bt_nkeys;		
-	internal uint bt_ndata;		
-	internal uint bt_pagecnt;		
-	internal uint bt_pagesize;		
-	internal uint bt_minkey;		
-	internal uint bt_re_len;		
-	internal uint bt_re_pad;		
-	internal uint bt_levels;		
-	internal uint bt_int_pg;		
-	internal uint bt_leaf_pg;		
-	internal uint bt_dup_pg;		
-	internal uint bt_over_pg;		
-	internal uint bt_empty_pg;		
-	internal uint bt_free;		
-	internal ulong bt_int_pgfree;	
-	internal ulong bt_leaf_pgfree;	
-	internal ulong bt_dup_pgfree;	
-	internal ulong bt_over_pgfree;	
+	internal uint bt_magic;
+	internal uint bt_version;
+	internal uint bt_metaflags;
+	internal uint bt_nkeys;
+	internal uint bt_ndata;
+	internal uint bt_pagecnt;
+	internal uint bt_pagesize;
+	internal uint bt_minkey;
+	internal uint bt_nblobs;
+	internal uint bt_re_len;
+	internal uint bt_re_pad;
+	internal uint bt_levels;
+	internal uint bt_int_pg;
+	internal uint bt_leaf_pg;
+	internal uint bt_dup_pg;
+	internal uint bt_over_pg;
+	internal uint bt_empty_pg;
+	internal uint bt_free;
+	internal ulong bt_int_pgfree;
+	internal ulong bt_leaf_pgfree;
+	internal ulong bt_dup_pgfree;
+	internal ulong bt_over_pgfree;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct RepMgrStatStruct {
-	internal ulong st_perm_failed;	
-	internal ulong st_msgs_queued;	
+	internal ulong st_perm_failed;
+	internal ulong st_msgs_queued;
 	internal ulong st_msgs_dropped;	
-	internal ulong st_connection_drop;	
-	internal ulong st_connect_fail;	
-	internal ulong st_elect_threads;	
-	internal ulong st_max_elect_threads;	
+	internal uint st_incoming_queue_gbytes;
+	internal uint st_incoming_queue_bytes;
+	internal ulong st_incoming_msgs_dropped;	
+	internal ulong st_connection_drop;
+	internal ulong st_connect_fail;
+	internal uint st_elect_threads;
+	internal uint st_max_elect_threads;
+	internal uint st_site_participants;
+	internal uint st_site_total;
+	internal uint st_site_views;
+	internal ulong st_takeovers;
     }
 
     [StructLayout(LayoutKind.Sequential)]
@@ -300,108 +316,109 @@ namespace BerkeleyDB.Internal {
 	 * off somewhat (or, on unreasonable architectures under unlucky
 	 * circumstances, garbaged).
 	 */
-	internal uint st_startup_complete;	
-	internal ulong st_log_queued;	
-	internal uint st_status;		
-	internal DB_LSN_STRUCT st_next_lsn;		
-	internal DB_LSN_STRUCT st_waiting_lsn;		
-	internal DB_LSN_STRUCT st_max_perm_lsn;		
-	internal uint st_next_pg;		
-	internal uint st_waiting_pg;	
+	internal uint st_startup_complete;
+	internal uint st_view;
+	internal ulong st_log_queued;
+	internal uint st_status;
+	internal DB_LSN_STRUCT st_next_lsn;
+	internal DB_LSN_STRUCT st_waiting_lsn;
+	internal DB_LSN_STRUCT st_max_perm_lsn;
+	internal uint st_next_pg;
+	internal uint st_waiting_pg;
 
 	internal uint st_dupmasters;	
-	internal IntPtr st_env_id;		
-	internal uint st_env_priority;	
-	internal ulong st_bulk_fills;	
-	internal ulong st_bulk_overflows;	
-	internal ulong st_bulk_records;	
-	internal ulong st_bulk_transfers;	
+	internal IntPtr st_env_id;
+	internal uint st_env_priority;
+	internal ulong st_bulk_fills;
+	internal ulong st_bulk_overflows;
+	internal ulong st_bulk_records;
+	internal ulong st_bulk_transfers;
 	internal ulong st_client_rerequests;
 	internal ulong st_client_svc_req;	
 	internal ulong st_client_svc_miss;	
-	internal uint st_gen;		
-	internal uint st_egen;		
-	internal ulong st_lease_chk;		
-	internal ulong st_lease_chk_misses;	
-	internal ulong st_lease_chk_refresh;	
-	internal ulong st_lease_sends;	
-
-	internal ulong st_log_duplicated;	
-	internal ulong st_log_queued_max;	
-	internal ulong st_log_queued_total;	
-	internal ulong st_log_records;	
-	internal ulong st_log_requested;	
-	internal IntPtr st_master;		
-	internal ulong st_master_changes;	
-	internal ulong st_msgs_badgen;	
-	internal ulong st_msgs_processed;	
+	internal uint st_gen;
+	internal uint st_egen;
+	internal ulong st_lease_chk;
+	internal ulong st_lease_chk_misses;
+	internal ulong st_lease_chk_refresh;
+	internal ulong st_lease_sends;
+
+	internal ulong st_log_duplicated;
+	internal ulong st_log_queued_max;
+	internal ulong st_log_queued_total;
+	internal ulong st_log_records;
+	internal ulong st_log_requested;
+	internal IntPtr st_master;
+	internal ulong st_master_changes;
+	internal ulong st_msgs_badgen;
+	internal ulong st_msgs_processed;
 	internal ulong st_msgs_recover;	
 	internal ulong st_msgs_send_failures;
-	internal ulong st_msgs_sent;	
-	internal ulong st_newsites;		
+	internal ulong st_msgs_sent;
+	internal ulong st_newsites;
 	internal uint st_nsites;		
-	internal ulong st_nthrottles;	
+	internal ulong st_nthrottles;
 	internal ulong st_outdated;		
-	internal ulong st_pg_duplicated;	
-	internal ulong st_pg_records;	
-	internal ulong st_pg_requested;	
-	internal ulong st_txns_applied;	
+	internal ulong st_pg_duplicated;
+	internal ulong st_pg_records;
+	internal ulong st_pg_requested;
+	internal ulong st_txns_applied;
 	internal ulong st_startsync_delayed;
 
 	
-	internal ulong st_elections;	
-	internal ulong st_elections_won;	
+	internal ulong st_elections;
+	internal ulong st_elections_won;
 
 	
-	internal IntPtr st_election_cur_winner;	
-	internal uint st_election_gen;	
-	internal uint st_election_datagen;	
-	internal DB_LSN_STRUCT st_election_lsn;		
-	internal uint st_election_nsites;	
-	internal uint st_election_nvotes;	
-	internal uint st_election_priority;	
-	internal int   st_election_status;	
+	internal IntPtr st_election_cur_winner;
+	internal uint st_election_gen;
+	internal uint st_election_datagen;
+	internal DB_LSN_STRUCT st_election_lsn;
+	internal uint st_election_nsites;
+	internal uint st_election_nvotes;
+	internal uint st_election_priority;
+	internal int   st_election_status;
 	internal uint st_election_tiebreaker;
-	internal uint st_election_votes;	
-	internal uint st_election_sec;	
-	internal uint st_election_usec;	
-	internal uint st_max_lease_sec;	
-	internal uint st_max_lease_usec;	
+	internal uint st_election_votes;
+	internal uint st_election_sec;
+	internal uint st_election_usec;
+	internal uint st_max_lease_sec;
+	internal uint st_max_lease_usec;
 
 	
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct SequenceStatStruct {
-	internal ulong st_wait;		
-	internal ulong st_nowait;		
-	internal long  st_current;		
-	internal long  st_value;		
-	internal long  st_last_value;	
-	internal long  st_min;		
-	internal long  st_max;		
-	internal int   st_cache_size;	
-	internal uint st_flags;		
+	internal ulong st_wait;
+	internal ulong st_nowait;
+	internal long  st_current;
+	internal long  st_value;
+	internal long  st_last_value;
+	internal long  st_min;
+	internal long  st_max;
+	internal uint st_cache_size;
+	internal uint st_flags;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct TransactionStatStruct {
 	internal uint st_nrestores;		
-	internal DB_LSN_STRUCT	  st_last_ckp;		
-	internal long	  st_time_ckp;		
-	internal uint st_last_txnid;	
-	internal uint st_inittxns;		
-	internal uint st_maxtxns;		
-	internal ulong st_naborts;		
-	internal ulong st_nbegins;		
-	internal ulong st_ncommits;		
-	internal uint st_nactive;		
-	internal uint st_nsnapshot;		
-	internal uint st_maxnactive;	
-	internal uint st_maxnsnapshot;	
-	internal ulong st_region_wait;	
-	internal ulong st_region_nowait;	
-	internal IntPtr	  st_regsize;		
+	internal DB_LSN_STRUCT	  st_last_ckp;
+	internal long	  st_time_ckp;
+	internal uint st_last_txnid;
+	internal uint st_inittxns;
+	internal uint st_maxtxns;
+	internal ulong st_naborts;
+	internal ulong st_nbegins;
+	internal ulong st_ncommits;
+	internal uint st_nactive;
+	internal uint st_nsnapshot;
+	internal uint st_maxnactive;
+	internal uint st_maxnsnapshot;
+	internal ulong st_region_wait;
+	internal ulong st_region_nowait;
+	internal IntPtr	  st_regsize;
 	internal IntPtr st_txnarray;
     }
 
diff --git a/lang/csharp/src/Internal/db_lockmode_t.cs b/lang/csharp/src/Internal/db_lockmode_t.cs
index 5db5ad05..e59c2a7d 100644
--- a/lang/csharp/src/Internal/db_lockmode_t.cs
+++ b/lang/csharp/src/Internal/db_lockmode_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/db_lockop_t.cs b/lang/csharp/src/Internal/db_lockop_t.cs
index ae4ce53b..e61a032d 100644
--- a/lang/csharp/src/Internal/db_lockop_t.cs
+++ b/lang/csharp/src/Internal/db_lockop_t.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/db_recops.cs b/lang/csharp/src/Internal/db_recops.cs
index 2b186559..61e22dda 100644
--- a/lang/csharp/src/Internal/db_recops.cs
+++ b/lang/csharp/src/Internal/db_recops.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/libdb_csharp.cs b/lang/csharp/src/Internal/libdb_csharp.cs
index db94d2a4..fd28787c 100644
--- a/lang/csharp/src/Internal/libdb_csharp.cs
+++ b/lang/csharp/src/Internal/libdb_csharp.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
diff --git a/lang/csharp/src/Internal/libdb_csharpPINVOKE.cs b/lang/csharp/src/Internal/libdb_csharpPINVOKE.cs
index 18243479..6be15c65 100644
--- a/lang/csharp/src/Internal/libdb_csharpPINVOKE.cs
+++ b/lang/csharp/src/Internal/libdb_csharpPINVOKE.cs
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -217,6 +217,21 @@ class libdb_csharpPINVOKE {
   [DllImport(libname, EntryPoint="CSharp_DB_set_append_recno")]
   public static extern int DB_set_append_recno(HandleRef jarg1, BDB_AppendRecnoDelegate jarg2);
 
+  [DllImport(libname, EntryPoint="CSharp_DB_get_blob_dir")]
+  public static extern int DB_get_blob_dir(HandleRef jarg1, out IntPtr jarg2);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_set_blob_dir")]
+  public static extern int DB_set_blob_dir(HandleRef jarg1, string jarg2);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_get_blob_sub_dir")]
+  public static extern int DB_get_blob_sub_dir(HandleRef jarg1, out IntPtr jarg2);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_get_blob_threshold")]
+  public static extern int DB_get_blob_threshold(HandleRef jarg1, ref uint jarg2);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_set_blob_threshold")]
+  public static extern int DB_set_blob_threshold(HandleRef jarg1, uint jarg2, uint jarg3);
+
   [DllImport(libname, EntryPoint="CSharp_DB_set_bt_compare")]
   public static extern int DB_set_bt_compare(HandleRef jarg1, BDB_CompareDelegate jarg2);
 
@@ -307,6 +322,21 @@ class libdb_csharpPINVOKE {
   [DllImport(libname, EntryPoint="CSharp_DB_set_pagesize")]
   public static extern int DB_set_pagesize(HandleRef jarg1, uint jarg2);
 
+  [DllImport(libname, EntryPoint="CSharp_DB_set_msgcall")]
+  public static extern void DB_set_msgcall(HandleRef jarg1, BDB_MsgcallDelegate jarg2);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_set_msgfile")]
+  public static extern int DB_set_msgfile(HandleRef jarg1, string jarg2);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_get_partition_keys")]
+  public static extern IntPtr DB_get_partition_keys(HandleRef jarg1, ref uint jarg2, ref uint jarg3, ref int jarg4);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_get_partition_parts")]
+  public static extern int DB_get_partition_parts(HandleRef jarg1, ref uint jarg2);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_set_partition")]
+  public static extern int DB_set_partition(HandleRef jarg1, uint jarg2, IntPtr[] jarg3, BDB_PartitionDelegate jarg4);
+
   [DllImport(libname, EntryPoint="CSharp_DB_get_priority")]
   public static extern int DB_get_priority(HandleRef jarg1, ref uint jarg2);
 
@@ -370,6 +400,9 @@ class libdb_csharpPINVOKE {
   [DllImport(libname, EntryPoint="CSharp_DBC_count")]
   public static extern int DBC_count(HandleRef jarg1, ref uint jarg2, uint jarg3);
 
+  [DllImport(libname, EntryPoint="CSharp_DBC_db_stream")]
+  public static extern IntPtr DBC_db_stream(HandleRef jarg1, uint jarg2, ref int jarg3);
+
   [DllImport(libname, EntryPoint="CSharp_DBC_del")]
   public static extern int DBC_del(HandleRef jarg1, uint jarg2);
 
@@ -481,6 +514,24 @@ class libdb_csharpPINVOKE {
   [DllImport(libname, EntryPoint="CSharp_delete_DB_SITE")]
   public static extern void delete_DB_SITE(HandleRef jarg1);
 
+  [DllImport(libname, EntryPoint="CSharp_DB_STREAM_close")]
+  public static extern int DB_STREAM_close(HandleRef jarg1, uint jarg2);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_STREAM_read")]
+  public static extern int DB_STREAM_read(HandleRef jarg1, HandleRef jarg2, Int64 jarg3, uint jarg4, uint jarg5);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_STREAM_size")]
+  public static extern int DB_STREAM_size(HandleRef jarg1, ref Int64 jarg2, uint jarg3);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_STREAM_write")]
+  public static extern int DB_STREAM_write(HandleRef jarg1, HandleRef jarg2, Int64 jarg3, uint jarg4);
+
+  [DllImport(libname, EntryPoint="CSharp_new_DB_STREAM")]
+  public static extern IntPtr new_DB_STREAM();
+
+  [DllImport(libname, EntryPoint="CSharp_delete_DB_STREAM")]
+  public static extern void delete_DB_STREAM(HandleRef jarg1);
+
   [DllImport(libname, EntryPoint="CSharp_DB_REPMGR_SITE_eid_set")]
   public static extern void DB_REPMGR_SITE_eid_set(HandleRef jarg1, int jarg2);
 
@@ -733,6 +784,12 @@ class libdb_csharpPINVOKE {
   [DllImport(libname, EntryPoint="CSharp_DB_ENV_repmgr_get_ack_policy")]
   public static extern int DB_ENV_repmgr_get_ack_policy(HandleRef jarg1, ref int jarg2);
 
+  [DllImport(libname, EntryPoint="CSharp_DB_ENV_repmgr_get_incoming_queue_max")]
+  public static extern int DB_ENV_repmgr_get_incoming_queue_max(HandleRef jarg1, ref uint jarg2, ref uint jarg3);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_ENV_repmgr_set_incoming_queue_max")]
+  public static extern int DB_ENV_repmgr_set_incoming_queue_max(HandleRef jarg1, uint jarg2, uint jarg3);
+
   [DllImport(libname, EntryPoint="CSharp_DB_ENV_repmgr_channel")]
   public static extern IntPtr DB_ENV_repmgr_channel(HandleRef jarg1, int jarg2, uint jarg3, ref int jarg4);
 
@@ -823,6 +880,9 @@ class libdb_csharpPINVOKE {
   [DllImport(libname, EntryPoint="CSharp_DB_ENV_rep_set_transport")]
   public static extern int DB_ENV_rep_set_transport(HandleRef jarg1, int jarg2, BDB_RepTransportDelegate jarg3);
 
+  [DllImport(libname, EntryPoint="CSharp_DB_ENV_rep_set_view")]
+  public static extern int DB_ENV_rep_set_view(HandleRef jarg1, BDB_ReplicationViewDelegate jarg2);
+
   [DllImport(libname, EntryPoint="CSharp_DB_ENV_set_backup_callbacks")]
   public static extern int DB_ENV_set_backup_callbacks(HandleRef jarg1, BDB_BackupOpenDelegate jarg2, BDB_BackupWriteDelegate jarg3, BDB_BackupCloseDelegate jarg4);
 
@@ -832,6 +892,18 @@ class libdb_csharpPINVOKE {
   [DllImport(libname, EntryPoint="CSharp_DB_ENV_set_backup_config")]
   public static extern int DB_ENV_set_backup_config(HandleRef jarg1, uint jarg2, uint jarg3);
 
+  [DllImport(libname, EntryPoint="CSharp_DB_ENV_get_blob_dir")]
+  public static extern int DB_ENV_get_blob_dir(HandleRef jarg1, out IntPtr jarg2);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_ENV_set_blob_dir")]
+  public static extern int DB_ENV_set_blob_dir(HandleRef jarg1, string jarg2);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_ENV_get_blob_threshold")]
+  public static extern int DB_ENV_get_blob_threshold(HandleRef jarg1, ref uint jarg2);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_ENV_set_blob_threshold")]
+  public static extern int DB_ENV_set_blob_threshold(HandleRef jarg1, uint jarg2, uint jarg3);
+
   [DllImport(libname, EntryPoint="CSharp_DB_ENV_get_cachesize")]
   public static extern int DB_ENV_get_cachesize(HandleRef jarg1, ref uint jarg2, ref uint jarg3, ref int jarg4);
 
@@ -997,6 +1069,12 @@ class libdb_csharpPINVOKE {
   [DllImport(libname, EntryPoint="CSharp_DB_ENV_set_mp_mmapsize")]
   public static extern int DB_ENV_set_mp_mmapsize(HandleRef jarg1, uint jarg2);
 
+  [DllImport(libname, EntryPoint="CSharp_DB_ENV_set_msgcall")]
+  public static extern void DB_ENV_set_msgcall(HandleRef jarg1, BDB_MsgcallDelegate jarg2);
+
+  [DllImport(libname, EntryPoint="CSharp_DB_ENV_set_msgfile")]
+  public static extern int DB_ENV_set_msgfile(HandleRef jarg1, string jarg2);
+
   [DllImport(libname, EntryPoint="CSharp_DB_ENV_get_thread_count")]
   public static extern int DB_ENV_get_thread_count(HandleRef jarg1, ref uint jarg2);
 
@@ -1190,7 +1268,7 @@ class libdb_csharpPINVOKE {
   public static extern int DB_SEQUENCE_close(HandleRef jarg1, uint jarg2);
 
   [DllImport(libname, EntryPoint="CSharp_DB_SEQUENCE_get")]
-  public static extern int DB_SEQUENCE_get(HandleRef jarg1, HandleRef jarg2, int jarg3, ref Int64 jarg4, uint jarg5);
+  public static extern int DB_SEQUENCE_get(HandleRef jarg1, HandleRef jarg2, uint jarg3, ref Int64 jarg4, uint jarg5);
 
   [DllImport(libname, EntryPoint="CSharp_DB_SEQUENCE_get_db")]
   public static extern IntPtr DB_SEQUENCE_get_db(HandleRef jarg1);
@@ -1208,10 +1286,10 @@ class libdb_csharpPINVOKE {
   public static extern int DB_SEQUENCE_remove(HandleRef jarg1, HandleRef jarg2, uint jarg3);
 
   [DllImport(libname, EntryPoint="CSharp_DB_SEQUENCE_get_cachesize")]
-  public static extern int DB_SEQUENCE_get_cachesize(HandleRef jarg1, ref int jarg2);
+  public static extern int DB_SEQUENCE_get_cachesize(HandleRef jarg1, ref uint jarg2);
 
   [DllImport(libname, EntryPoint="CSharp_DB_SEQUENCE_set_cachesize")]
-  public static extern int DB_SEQUENCE_set_cachesize(HandleRef jarg1, int jarg2);
+  public static extern int DB_SEQUENCE_set_cachesize(HandleRef jarg1, uint jarg2);
 
   [DllImport(libname, EntryPoint="CSharp_DB_SEQUENCE_get_flags")]
   public static extern int DB_SEQUENCE_get_flags(HandleRef jarg1, ref uint jarg2);