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

27 files changed, 3050 insertions, 906 deletions

diff --git a/lang/perl/BerkeleyDB/BerkeleyDB.pm b/lang/perl/BerkeleyDB/BerkeleyDB.pm
index 45f64c87..8eb0a3a5 100644
--- a/lang/perl/BerkeleyDB/BerkeleyDB.pm
+++ b/lang/perl/BerkeleyDB/BerkeleyDB.pm
@@ -2,7 +2,7 @@
 package BerkeleyDB;
 
 
-#     Copyright (c) 1997-2011 Paul Marquess. All rights reserved.
+#     Copyright (c) 1997-2013 Paul Marquess. All rights reserved.
 #     This program is free software; you can redistribute it and/or
 #     modify it under the same terms as Perl itself.
 #
@@ -10,18 +10,16 @@ package BerkeleyDB;
 # The documentation for this module is at the bottom of this file,
 # after the line __END__.
 
-BEGIN { require 5.005 }
+use 5.006;
 
 use strict;
 use Carp;
 use vars qw($VERSION @ISA @EXPORT $AUTOLOAD
 		$use_XSLoader);
 
-$VERSION = '0.50';
+$VERSION = '0.55';
 
 require Exporter;
-#require DynaLoader;
-require AutoLoader;
 
 BEGIN {
     $use_XSLoader = 1 ;
@@ -77,6 +75,7 @@ BEGIN {
 	DB_CDB_ALLDB
 	DB_CHECKPOINT
 	DB_CHKSUM
+	DB_CHKSUM_FAIL
 	DB_CHKSUM_SHA1
 	DB_CKP_INTERNAL
 	DB_CLIENT
@@ -160,11 +159,14 @@ BEGIN {
 	DB_ENV_TXN_WRITE_NOSYNC
 	DB_ENV_USER_ALLOC
 	DB_ENV_YIELDCPU
+	DB_EVENT_FAILCHK_PANIC
+	DB_EVENT_MUTEX_DIED
 	DB_EVENT_NOT_HANDLED
 	DB_EVENT_NO_SUCH_EVENT
 	DB_EVENT_PANIC
 	DB_EVENT_REG_ALIVE
 	DB_EVENT_REG_PANIC
+	DB_EVENT_REP_AUTOTAKEOVER_FAILED
 	DB_EVENT_REP_CLIENT
 	DB_EVENT_REP_CONNECT_BROKEN
 	DB_EVENT_REP_CONNECT_ESTD
@@ -173,6 +175,7 @@ BEGIN {
 	DB_EVENT_REP_ELECTED
 	DB_EVENT_REP_ELECTION_FAILED
 	DB_EVENT_REP_INIT_DONE
+	DB_EVENT_REP_INQUEUE_FULL
 	DB_EVENT_REP_JOIN_FAILURE
 	DB_EVENT_REP_LOCAL_SITE_REMOVED
 	DB_EVENT_REP_MASTER
@@ -185,9 +188,12 @@ BEGIN {
 	DB_EVENT_REP_WOULD_ROLLBACK
 	DB_EVENT_WRITE_FAILED
 	DB_EXCL
+	DB_EXIT_FAILCHK
+	DB_EXIT_FILE_EXISTS
 	DB_EXTENT
 	DB_FAILCHK
 	DB_FAILCHK_ISALIVE
+	DB_FAILURE_SYMPTOM_SIZE
 	DB_FAST_STAT
 	DB_FCNTL_LOCKING
 	DB_FILEOPEN
@@ -234,6 +240,7 @@ BEGIN {
 	DB_INIT_REP
 	DB_INIT_TXN
 	DB_INORDER
+	DB_INTERNAL_BLOB_DB
 	DB_INTERNAL_DB
 	DB_INTERNAL_PERSISTENT_DB
 	DB_INTERNAL_TEMPORARY_DB
@@ -298,6 +305,7 @@ BEGIN {
 	DB_LOGVERSION_LATCHING
 	DB_LOG_AUTOREMOVE
 	DB_LOG_AUTO_REMOVE
+	DB_LOG_BLOB
 	DB_LOG_BUFFER_FULL
 	DB_LOG_CHKPNT
 	DB_LOG_COMMIT
@@ -308,6 +316,7 @@ BEGIN {
 	DB_LOG_IN_MEMORY
 	DB_LOG_LOCKED
 	DB_LOG_NOCOPY
+	DB_LOG_NOSYNC
 	DB_LOG_NOT_DURABLE
 	DB_LOG_NO_DATA
 	DB_LOG_PERM
@@ -353,8 +362,10 @@ BEGIN {
 	DB_MUTEXDEBUG
 	DB_MUTEXLOCKS
 	DB_MUTEX_ALLOCATED
+	DB_MUTEX_DESCRIBE_STRLEN
 	DB_MUTEX_LOCKED
 	DB_MUTEX_LOGICAL_LOCK
+	DB_MUTEX_OWNER_DEAD
 	DB_MUTEX_PROCESS_ONLY
 	DB_MUTEX_SELF_BLOCK
 	DB_MUTEX_SHARED
@@ -446,9 +457,12 @@ BEGIN {
 	DB_REPMGR_ACKS_QUORUM
 	DB_REPMGR_CONF_2SITE_STRICT
 	DB_REPMGR_CONF_ELECTIONS
+	DB_REPMGR_CONF_PREFMAS_CLIENT
+	DB_REPMGR_CONF_PREFMAS_MASTER
 	DB_REPMGR_CONNECTED
 	DB_REPMGR_DISCONNECTED
 	DB_REPMGR_ISPEER
+	DB_REPMGR_ISVIEW
 	DB_REPMGR_NEED_RESPONSE
 	DB_REPMGR_PEER
 	DB_REP_ACK_TIMEOUT
@@ -460,6 +474,7 @@ BEGIN {
 	DB_REP_CONF_AUTOROLLBACK
 	DB_REP_CONF_BULK
 	DB_REP_CONF_DELAYCLIENT
+	DB_REP_CONF_ELECT_LOGLENGTH
 	DB_REP_CONF_INMEM
 	DB_REP_CONF_LEASE
 	DB_REP_CONF_NOAUTOINIT
@@ -520,6 +535,7 @@ BEGIN {
 	DB_SET
 	DB_SET_LOCK_TIMEOUT
 	DB_SET_LTE
+	DB_SET_MUTEX_FAILCHK_TIMEOUT
 	DB_SET_RANGE
 	DB_SET_RECNO
 	DB_SET_REG_TIMEOUT
@@ -540,6 +556,9 @@ BEGIN {
 	DB_STAT_NOERROR
 	DB_STAT_SUBSYSTEM
 	DB_STAT_SUMMARY
+	DB_STREAM_READ
+	DB_STREAM_SYNC_WRITE
+	DB_STREAM_WRITE
 	DB_ST_DUPOK
 	DB_ST_DUPSET
 	DB_ST_DUPSORT
@@ -619,6 +638,7 @@ BEGIN {
 	DB_VERB_DEADLOCK
 	DB_VERB_FILEOPS
 	DB_VERB_FILEOPS_ALL
+	DB_VERB_MVCC
 	DB_VERB_RECOVERY
 	DB_VERB_REGISTER
 	DB_VERB_REPLICATION
@@ -662,6 +682,7 @@ BEGIN {
 	LOGREC_Done
 	LOGREC_HDR
 	LOGREC_LOCKS
+	LOGREC_LONGARG
 	LOGREC_OP
 	LOGREC_PGDBT
 	LOGREC_PGDDBT
@@ -919,6 +940,8 @@ sub new
 					SharedMemKey	=> undef,
 					Set_Lk_Exclusive	=> undef,
 					ThreadCount	=> 0,
+					BlobThreshold	=> 0,
+                    BlobDir	=> undef,
 					}, @_) ;
 
     my $errfile  = $got->{ErrFile} ;				
@@ -1058,6 +1081,10 @@ sub new
 			WriteKey	=> undef,
 			ReadValue	=> undef,
 			WriteValue	=> undef,
+
+            # Blob
+            BlobThreshold	=> 0,
+            BlobDir	=> undef,
 		      }, @_) ;
 
     croak("Env not of type BerkeleyDB::Env")
@@ -1118,6 +1145,10 @@ sub new
 			DupCompare	=> undef,
 			Prefix 		=> undef,
 			set_bt_compress	=> undef,
+
+            # Blob
+            BlobThreshold	=> 0,
+            BlobDir	=> undef,
 		      }, @_) ;
 
     croak("Env not of type BerkeleyDB::Env")
@@ -1190,6 +1221,10 @@ sub new
 			# Heap specific
 			HeapSize	=> undef,
 			HeapSizeGb	=> undef,
+
+            # Blob
+            BlobThreshold	=> 0,
+            BlobDir	=> undef,
 		      }, @_) ;
 
     croak("Env not of type BerkeleyDB::Env")
@@ -1899,12 +1934,45 @@ sub c_dup
     return $obj ;
 }
 
+sub c_get_db_stream
+{
+    my $cursor = shift ;
+
+    my $addr = $cursor->_c_get_db_stream(@_);
+    my $obj ;
+    $obj = bless [$addr, $cursor] , "BerkeleyDB::DbStream" if $addr ;
+    return $obj ;
+}
+
+sub db_stream
+{
+    my $db = shift ;
+    my ($addr) = $db->_db_stream(@_) ;
+    my $obj ;
+    $obj = bless [$addr, $db] , "BerkeleyDB::DbStream" if $addr ;
+    return $obj ;
+}
+
+#sub gdbs
+#{
+#    my $cursor = shift ;
+#
+#    my $k = '';
+#    my $v = '';
+#    $db->partial_set(0,0) ;
+#    ok $cursor->c_get($k, $v, DB_FIRST) == 0, "set cursor"
+#        or diag "Status is [" . $cursor->status() . "]";
+#    $db->partial_clear() ;
+#    is $k, "1";
+#}
+
 sub DESTROY
 {
     my $self = shift ;
     $self->_DESTROY() ;
 }
 
+
 package BerkeleyDB::TxnMgr ;
 
 sub DESTROY
@@ -2009,7 +2077,8 @@ sub cds_unlock
         if ($Count{"$db"} == 0)
         {
             $Object{"$db"}->c_close() ;
-            undef $Object{"$db"};
+            delete $Object{"$db"};
+            delete $Count{"$db"};
         }
 
         return 1 ;
@@ -2036,7 +2105,6 @@ package BerkeleyDB ;
 
 
 
-# Autoload methods go after =cut, and are processed by the autosplit program.
 
 1;
 __END__
diff --git a/lang/perl/BerkeleyDB/BerkeleyDB.pod b/lang/perl/BerkeleyDB/BerkeleyDB.pod
index 19fcba83..ba1c8dd3 100644
--- a/lang/perl/BerkeleyDB/BerkeleyDB.pod
+++ b/lang/perl/BerkeleyDB/BerkeleyDB.pod
@@ -49,6 +49,8 @@ BerkeleyDB - Perl extension for Berkeley DB version 2, 3, 4 or 5
   $boolean = $db->byteswapped() ;
   $status = $db->truncate($count) ;
   $status = $db->compact($start, $stop, $c_data, $flags, $end);
+  $status = $db->get_blob_threshold($t1) ;
+  $status = $db->get_blob_dir($dir) ;
 
   $bool = $env->cds_enabled();
   $bool = $db->cds_enabled();
@@ -67,11 +69,16 @@ BerkeleyDB - Perl extension for Berkeley DB version 2, 3, 4 or 5
   $status = $cursor->c_pget() ;
   $status = $cursor->status() ;
   $status = $cursor->c_close() ;
+  $stream = $cursor->db_stream() ;
 
   $cursor = $db->db_join() ;
   $status = $cursor->c_get() ;
   $status = $cursor->c_close() ;
 
+  $status = $stream->size($S);
+  $status = $stream->read($data, $offset, $size);
+  $status = $stream->write($data, $offset);
+
   $status = $env->txn_checkpoint()
   $hash_ref = $env->txn_stat()
   $status = $env->set_mutexlocks()
@@ -79,6 +86,8 @@ BerkeleyDB - Perl extension for Berkeley DB version 2, 3, 4 or 5
   $status = $env->set_timeout()
   $status = $env->lock_detect()
   $status = $env->lsn_reset()
+  $status = $env->get_blob_threshold($t1) ;
+  $status = $env->get_blob_dir($dir) ;
 
   $txn = $env->txn_begin() ;
   $db->Txn($txn);
@@ -120,11 +129,11 @@ B<NOTE: This document is still under construction. Expect it to be
 incomplete in places.>
 
 This Perl module provides an interface to most of the functionality
-available in Berkeley DB versions 2, 3 and 4. In general it is safe to assume
+available in Berkeley DB versions 2, 3, 5 and 6. In general it is safe to assume
 that the interface provided here to be identical to the Berkeley DB
 interface. The main changes have been to make the Berkeley DB API work
 in a Perl way. Note that if you are using Berkeley DB 2.x, the new
-features available in Berkeley DB 3.x or DB 4.x are not available via
+features available in Berkeley DB 3.x or later are not available via
 this module.
 
 The reader is expected to be familiar with the Berkeley DB
@@ -141,7 +150,7 @@ classes.
 
 The B<BerkeleyDB::Env> class provides an interface to the Berkeley DB
 function B<db_appinit> in Berkeley DB 2.x or B<db_env_create> and
-B<DBENV-E<gt>open> in Berkeley DB 3.x/4.x. Its purpose is to initialise a
+B<DBENV-E<gt>open> in Berkeley DB 3.x (or later). Its purpose is to initialise a
 number of sub-systems that can then be used in a consistent way in all
 the databases you make use of in the environment.
 
@@ -173,6 +182,8 @@ with the C<Flags> parameter, described below.
              [ -MaxObjects   => number, ]
              [ -SharedMemKey => number, ]
              [ -Verbose      => boolean, ]
+             [ -BlobThreshold=> $number, ]
+             [ -BlobDir      => directory, ]
              [ -Encrypt      => { Password => "string",
 	                          Flags    => number }, ]
 
@@ -273,6 +284,22 @@ maximum number of threads but rather is used to determine memory sizing.
 This option requires Berkeley DB 4.4 or better. It is only supported on
 Unix/Linux.
 
+=item -BlobThreshold
+
+Sets the size threshold that will be used to decide when data is stored as
+a BLOB. This option must be set for a blobs to be used.
+
+This option requires Berkeley DB 6.0 or better. 
+
+=item -BlobDir      
+
+The directory where the BLOB objects are stored.
+
+If not specified blob files are stores in the environment directoy.
+
+
+This option requires Berkeley DB 6.0 or better. 
+
 =item -Config
 
 This is a variation on the C<-Home> parameter, but it allows finer
@@ -292,7 +319,7 @@ The code below shows an example of how it can be used.
 
 =item -ErrFile
 
-Expects a filename or filenhandle. Any errors generated internally by
+Expects a filename or filehandle. Any errors generated internally by
 Berkeley DB will be logged to this file. A useful debug setting is to
 open environments with either
 
@@ -468,7 +495,7 @@ Berkeley DB environment into C<$id>. Returns 0 on success.
 
 This option requires Berkeley DB 4.2 or better.
 
-Use the C<-SharedMemKey> option when opening the environemt to set the
+Use the C<-SharedMemKey> option when opening the environmet to set the
 base segment ID.
 
 =item $env->set_isalive()
@@ -493,7 +520,7 @@ determines a thread of control exited with an unresolved transaction, the
 transaction will be aborted.
 
 Applications calling the $env->failchk method must have already called the
-$env->set_isalive method, on the same DB environement, and must have
+$env->set_isalive method, on the same DB environment, and must have
 configured their database environment using the -ThreadCount flag. The
 ThreadCount flag cannot be used on an environment that wasn't previously
 initialized with it.
@@ -527,6 +554,14 @@ file. Otherwise output is sent to standard output.
 
 This option requires Berkeley DB 4.4 or better.
 
+=item $status = $env->get_blob_threshold($t1) ;
+
+Sets the parameter $t1 to the threshold value (in bytes) that is used to
+determine when a data item is stored as a Blob.
+
+=item $status = $env->get_blob_dir($dir) ;
+
+Sets the $dir parameter to the directory where blob files are stored.
 
 =item $env->set_timeout($timeout, $flags)
 
@@ -620,6 +655,8 @@ Two forms of constructor are supported:
                 [ -Txn           => $txn,]
                 [ -Encrypt       => { Password => "string",
 	                              Flags    => number }, ],
+                [ -BlobThreshold=> $number, ]
+                [ -BlobDir      => directory, ]
                 # BerkeleyDB::Hash specific
                 [ -Ffactor       => number,]
                 [ -Nelem         => number,]
@@ -641,6 +678,8 @@ and this
                 [ -Txn           => $txn,]
                 [ -Encrypt       => { Password => "string",
 	                              Flags    => number }, ],
+                [ -BlobThreshold=> $number, ]
+                [ -BlobDir      => directory, ]
                 # BerkeleyDB::Hash specific
                 [ -Ffactor       => number,]
                 [ -Nelem         => number,]
@@ -934,6 +973,8 @@ Two forms of constructor are supported:
                 [ -Txn           => $txn,]
                 [ -Encrypt       => { Password => "string",
 	                              Flags    => number }, ],
+                [ -BlobThreshold=> $number, ]
+                [ -BlobDir      => directory, ]
                 # BerkeleyDB::Btree specific
                 [ -Minkey        => number,]
                 [ -Compare       => code reference,]
@@ -955,6 +996,8 @@ and this
                 [ -Txn           => $txn,]
                 [ -Encrypt       => { Password => "string",
 	                              Flags    => number }, ],
+                [ -BlobThreshold=> $number, ]
+                [ -BlobDir      => directory, ]
                 # BerkeleyDB::Btree specific
                 [ -Minkey        => number,]
                 [ -Compare       => code reference,]
@@ -1334,6 +1377,8 @@ One form of constructor is supported:
                 [ -Txn           => $txn,]
                 [ -Encrypt       => { Password => "string",
 	                              Flags    => number }, ],
+                [ -BlobThreshold=> $number, ]
+                [ -BlobDir      => directory, ]
                 # BerkeleyDB::Heap specific
                 [ -HeapSize      => number, ]
                 [ -HeapSizeGb    => number, ]
@@ -1575,6 +1620,15 @@ TODO
 
 TODO
 
+=head2 $status = $db->get_blob_threshold($t1) ;
+
+Sets the parameter $t1 to the threshold value (in bytes) that is used to
+determine when a data item is stored as a Blob.
+
+=head2 $status = $db->get_blob_dir($dir) ;
+
+Sets the $dir parameter to the directory where blob files are stored.
+
 =head2 $db->type()
 
 Returns the type of the database. The possible return code are B<DB_HASH>
@@ -1605,7 +1659,7 @@ Removes a CDS lock. The destruction of the CDS lock object automatically
 calls this method.
 
 Note that if multiple CDS lock objects are created, the underlying write
-lock will not be released until all CDS lock objects are either explictly
+lock will not be released until all CDS lock objects are either explicitly
 unlocked with this method, or the CDS lock objects have been destroyed.
 
 =head2 $ref = $db->db_stat()
@@ -1629,7 +1683,7 @@ Returns the status of the last C<$db> method called.
 
 =head2 $status = $db->truncate($count)
 
-Truncates the datatabase and returns the number or records deleted
+Truncates the database and returns the number or records deleted
 in C<$count>.
 
 =head2  $status = $db->compact($start, $stop, $c_data, $flags, $end);
@@ -1637,7 +1691,7 @@ in C<$count>.
 Compacts the database C<$db>. 
 
 All the parameters are optional - if only want to make use of some of them,
-use C<undef> for those you don't want.  Trailing unusused parameters can be
+use C<undef> for those you don't want.  Trailing unused parameters can be
 omitted. For example, if you only want to use the C<$c_data> parameter to
 set the C<compact_fillpercent>, write you code like this
 
@@ -1921,6 +1975,19 @@ See C<db_pget>
 
 Closes the cursor B<$cursor>.
 
+=head2 $stream = $cursor->db_stream($flags);
+
+Create a BerkeleyDB::DbStream object to read the blob at the current cursor location.
+See L<Blob> for details of the the BerkeleyDB::DbStream object.
+
+$flags must be one or more of the following OR'ed together
+
+DB_STREAM_READ
+DB_STREAM_WRITE
+DB_STREAM_SYNC_WRITE
+
+For full information on the flags refer to the Berkeley DB Reference Guide.
+
 =head2 Cursor Examples
 
 TODO
@@ -1970,6 +2037,81 @@ and to roll back call abort:
 After committing or aborting a child transaction you need to set the active
 transaction again using C<Txn>.
 
+=head1 BerkeleyDBB::DbStream -- support for BLOB
+
+Blob support is available in Berkeley DB starting with version 6.0. Refer
+to the section "Blob Support" in the Berkeley DB Programmer Reference for
+details of how Blob supports works.
+
+A Blob is access via a BerkeleyDBB::DbStream object. This is created via a
+cursor object.
+
+    # Note - error handling not shown below.
+
+    # Set the key we want
+    my $k = "some key";
+
+    # Don't want the value retrieved by the cursor,
+    # so use partial_set to make sure no data is retrieved.
+    my $v = '';
+    $cursor->partial_set(0,0) ;
+    $cursor->c_get($k, $v, DB_SET) ;
+    $cursor->partial_clear() ;
+
+    # Now create a stream to the blob
+    my $stream = $cursor->db_stream(DB_STREAM_WRITE) ;
+
+    # get the size of the blob
+    $stream->size(my $s) ;
+
+    # Read the first 1k of data from the blob
+    my $data ;
+    $stream->read($data, 0, 1024);
+
+A BerkeleyDB::DbStream object has the following methods available:
+
+
+=head2 $status = $stream->size($SIZE);
+
+Outputs the length of the Blob in the $SIZE parameter.
+
+=head2 $status = $stream->read($data, $offset, $size);
+
+Read from the blob. $offset is the number of bytes from the start of the
+blob to read from. $size if the number of bytes to read.
+
+=head2 $status = $stream->write($data, $offset, $flags);
+
+Write $data to the blob, starting at offset $offset.
+
+Example
+
+Below is an example of how to walk through a database when you don't know
+beforehand which entries are blobs and which are not.
+
+    while (1)
+    {
+        my $k = '';
+        my $v = '';
+        $cursor->partial_set(0,0) ;
+        my $status = $cursor->c_get($k, $v, DB_NEXT) ;
+        $cursor->partial_clear();
+
+        last if $status != 0 ;
+
+        my $stream = $cursor->db_stream(DB_STREAM_WRITE);
+
+        if (defined $stream)
+        {
+            # It's a Blob
+            $stream->size(my $s) ;
+        }
+        else
+        {
+            # Not a Blob
+            $cursor->c_get($k, $v, DB_CURRENT) ;
+        }
+    }
 
 =head1 Berkeley DB Concurrent Data Store (CDS)
 
@@ -2553,7 +2695,7 @@ The official web site for Berkeley DB is F<http://www.oracle.com/technology/prod
 
 =head1 COPYRIGHT
 
-Copyright (c) 1997-2004 Paul Marquess. All rights reserved. This program
+Copyright (c) 1997-2013 Paul Marquess. All rights reserved. This program
 is free software; you can redistribute it and/or modify it under the
 same terms as Perl itself.
 
diff --git a/lang/perl/BerkeleyDB/BerkeleyDB.pod.P b/lang/perl/BerkeleyDB/BerkeleyDB.pod.P
index 6e547610..e1160c50 100644
--- a/lang/perl/BerkeleyDB/BerkeleyDB.pod.P
+++ b/lang/perl/BerkeleyDB/BerkeleyDB.pod.P
@@ -49,6 +49,8 @@ BerkeleyDB - Perl extension for Berkeley DB version 2, 3, 4 or 5
   $boolean = $db->byteswapped() ;
   $status = $db->truncate($count) ;
   $status = $db->compact($start, $stop, $c_data, $flags, $end);
+  $status = $db->get_blob_threshold($t1) ;
+  $status = $db->get_blob_dir($dir) ;
 
   $bool = $env->cds_enabled();
   $bool = $db->cds_enabled();
@@ -67,11 +69,16 @@ BerkeleyDB - Perl extension for Berkeley DB version 2, 3, 4 or 5
   $status = $cursor->c_pget() ;
   $status = $cursor->status() ;
   $status = $cursor->c_close() ;
+  $stream = $cursor->db_stream() ;
 
   $cursor = $db->db_join() ;
   $status = $cursor->c_get() ;
   $status = $cursor->c_close() ;
 
+  $status = $stream->size($S);
+  $status = $stream->read($data, $offset, $size);
+  $status = $stream->write($data, $offset);
+
   $status = $env->txn_checkpoint()
   $hash_ref = $env->txn_stat()
   $status = $env->set_mutexlocks()
@@ -79,6 +86,8 @@ BerkeleyDB - Perl extension for Berkeley DB version 2, 3, 4 or 5
   $status = $env->set_timeout()
   $status = $env->lock_detect()
   $status = $env->lsn_reset()
+  $status = $env->get_blob_threshold($t1) ;
+  $status = $env->get_blob_dir($dir) ;
 
   $txn = $env->txn_begin() ;
   $db->Txn($txn);
@@ -120,11 +129,11 @@ B<NOTE: This document is still under construction. Expect it to be
 incomplete in places.>
 
 This Perl module provides an interface to most of the functionality
-available in Berkeley DB versions 2, 3 and 4. In general it is safe to assume
+available in Berkeley DB versions 2, 3, 5 and 6. In general it is safe to assume
 that the interface provided here to be identical to the Berkeley DB
 interface. The main changes have been to make the Berkeley DB API work
 in a Perl way. Note that if you are using Berkeley DB 2.x, the new
-features available in Berkeley DB 3.x or DB 4.x are not available via
+features available in Berkeley DB 3.x or later are not available via
 this module.
 
 The reader is expected to be familiar with the Berkeley DB
@@ -141,7 +150,7 @@ classes.
 
 The B<BerkeleyDB::Env> class provides an interface to the Berkeley DB
 function B<db_appinit> in Berkeley DB 2.x or B<db_env_create> and
-B<DBENV-E<gt>open> in Berkeley DB 3.x/4.x. Its purpose is to initialise a
+B<DBENV-E<gt>open> in Berkeley DB 3.x (or later). Its purpose is to initialise a
 number of sub-systems that can then be used in a consistent way in all
 the databases you make use of in the environment.
 
@@ -173,6 +182,8 @@ with the C<Flags> parameter, described below.
              [ -MaxObjects   => number, ]
              [ -SharedMemKey => number, ]
              [ -Verbose      => boolean, ]
+             [ -BlobThreshold=> $number, ]
+             [ -BlobDir      => directory, ]
              [ -Encrypt      => { Password => "string",
 	                          Flags    => number }, ]
 
@@ -273,6 +284,22 @@ maximum number of threads but rather is used to determine memory sizing.
 This option requires Berkeley DB 4.4 or better. It is only supported on
 Unix/Linux.
 
+=item -BlobThreshold
+
+Sets the size threshold that will be used to decide when data is stored as
+a BLOB. This option must be set for a blobs to be used.
+
+This option requires Berkeley DB 6.0 or better. 
+
+=item -BlobDir      
+
+The directory where the BLOB objects are stored.
+
+If not specified blob files are stores in the environment directoy.
+
+
+This option requires Berkeley DB 6.0 or better. 
+
 =item -Config
 
 This is a variation on the C<-Home> parameter, but it allows finer
@@ -292,7 +319,7 @@ The code below shows an example of how it can be used.
 
 =item -ErrFile
 
-Expects a filename or filenhandle. Any errors generated internally by
+Expects a filename or filehandle. Any errors generated internally by
 Berkeley DB will be logged to this file. A useful debug setting is to
 open environments with either
 
@@ -468,7 +495,7 @@ Berkeley DB environment into C<$id>. Returns 0 on success.
 
 This option requires Berkeley DB 4.2 or better.
 
-Use the C<-SharedMemKey> option when opening the environemt to set the
+Use the C<-SharedMemKey> option when opening the environmet to set the
 base segment ID.
 
 =item $env->set_isalive()
@@ -493,7 +520,7 @@ determines a thread of control exited with an unresolved transaction, the
 transaction will be aborted.
 
 Applications calling the $env->failchk method must have already called the
-$env->set_isalive method, on the same DB environement, and must have
+$env->set_isalive method, on the same DB environment, and must have
 configured their database environment using the -ThreadCount flag. The
 ThreadCount flag cannot be used on an environment that wasn't previously
 initialized with it.
@@ -527,6 +554,14 @@ file. Otherwise output is sent to standard output.
 
 This option requires Berkeley DB 4.4 or better.
 
+=item $status = $env->get_blob_threshold($t1) ;
+
+Sets the parameter $t1 to the threshold value (in bytes) that is used to
+determine when a data item is stored as a Blob.
+
+=item $status = $env->get_blob_dir($dir) ;
+
+Sets the $dir parameter to the directory where blob files are stored.
 
 =item $env->set_timeout($timeout, $flags)
 
@@ -620,6 +655,8 @@ Two forms of constructor are supported:
                 [ -Txn           => $txn,]
                 [ -Encrypt       => { Password => "string",
 	                              Flags    => number }, ],
+                [ -BlobThreshold=> $number, ]
+                [ -BlobDir      => directory, ]
                 # BerkeleyDB::Hash specific
                 [ -Ffactor       => number,]
                 [ -Nelem         => number,]
@@ -641,6 +678,8 @@ and this
                 [ -Txn           => $txn,]
                 [ -Encrypt       => { Password => "string",
 	                              Flags    => number }, ],
+                [ -BlobThreshold=> $number, ]
+                [ -BlobDir      => directory, ]
                 # BerkeleyDB::Hash specific
                 [ -Ffactor       => number,]
                 [ -Nelem         => number,]
@@ -826,6 +865,8 @@ Two forms of constructor are supported:
                 [ -Txn           => $txn,]
                 [ -Encrypt       => { Password => "string",
 	                              Flags    => number }, ],
+                [ -BlobThreshold=> $number, ]
+                [ -BlobDir      => directory, ]
                 # BerkeleyDB::Btree specific
                 [ -Minkey        => number,]
                 [ -Compare       => code reference,]
@@ -847,6 +888,8 @@ and this
                 [ -Txn           => $txn,]
                 [ -Encrypt       => { Password => "string",
 	                              Flags    => number }, ],
+                [ -BlobThreshold=> $number, ]
+                [ -BlobDir      => directory, ]
                 # BerkeleyDB::Btree specific
                 [ -Minkey        => number,]
                 [ -Compare       => code reference,]
@@ -1140,6 +1183,8 @@ One form of constructor is supported:
                 [ -Txn           => $txn,]
                 [ -Encrypt       => { Password => "string",
 	                              Flags    => number }, ],
+                [ -BlobThreshold=> $number, ]
+                [ -BlobDir      => directory, ]
                 # BerkeleyDB::Heap specific
                 [ -HeapSize      => number, ]
                 [ -HeapSizeGb    => number, ]
@@ -1381,6 +1426,15 @@ TODO
 
 TODO
 
+=head2 $status = $db->get_blob_threshold($t1) ;
+
+Sets the parameter $t1 to the threshold value (in bytes) that is used to
+determine when a data item is stored as a Blob.
+
+=head2 $status = $db->get_blob_dir($dir) ;
+
+Sets the $dir parameter to the directory where blob files are stored.
+
 =head2 $db->type()
 
 Returns the type of the database. The possible return code are B<DB_HASH>
@@ -1411,7 +1465,7 @@ Removes a CDS lock. The destruction of the CDS lock object automatically
 calls this method.
 
 Note that if multiple CDS lock objects are created, the underlying write
-lock will not be released until all CDS lock objects are either explictly
+lock will not be released until all CDS lock objects are either explicitly
 unlocked with this method, or the CDS lock objects have been destroyed.
 
 =head2 $ref = $db->db_stat()
@@ -1435,7 +1489,7 @@ Returns the status of the last C<$db> method called.
 
 =head2 $status = $db->truncate($count)
 
-Truncates the datatabase and returns the number or records deleted
+Truncates the database and returns the number or records deleted
 in C<$count>.
 
 =head2  $status = $db->compact($start, $stop, $c_data, $flags, $end);
@@ -1443,7 +1497,7 @@ in C<$count>.
 Compacts the database C<$db>. 
 
 All the parameters are optional - if only want to make use of some of them,
-use C<undef> for those you don't want.  Trailing unusused parameters can be
+use C<undef> for those you don't want.  Trailing unused parameters can be
 omitted. For example, if you only want to use the C<$c_data> parameter to
 set the C<compact_fillpercent>, write you code like this
 
@@ -1727,6 +1781,19 @@ See C<db_pget>
 
 Closes the cursor B<$cursor>.
 
+=head2 $stream = $cursor->db_stream($flags);
+
+Create a BerkeleyDB::DbStream object to read the blob at the current cursor location.
+See L<Blob> for details of the the BerkeleyDB::DbStream object.
+
+$flags must be one or more of the following OR'ed together
+
+DB_STREAM_READ
+DB_STREAM_WRITE
+DB_STREAM_SYNC_WRITE
+
+For full information on the flags refer to the Berkeley DB Reference Guide.
+
 =head2 Cursor Examples
 
 TODO
@@ -1776,6 +1843,81 @@ and to roll back call abort:
 After committing or aborting a child transaction you need to set the active
 transaction again using C<Txn>.
 
+=head1 BerkeleyDBB::DbStream -- support for BLOB
+
+Blob support is available in Berkeley DB starting with version 6.0. Refer
+to the section "Blob Support" in the Berkeley DB Programmer Reference for
+details of how Blob supports works.
+
+A Blob is access via a BerkeleyDBB::DbStream object. This is created via a
+cursor object.
+
+    # Note - error handling not shown below.
+
+    # Set the key we want
+    my $k = "some key";
+
+    # Don't want the value retrieved by the cursor,
+    # so use partial_set to make sure no data is retrieved.
+    my $v = '';
+    $cursor->partial_set(0,0) ;
+    $cursor->c_get($k, $v, DB_SET) ;
+    $cursor->partial_clear() ;
+
+    # Now create a stream to the blob
+    my $stream = $cursor->db_stream(DB_STREAM_WRITE) ;
+
+    # get the size of the blob
+    $stream->size(my $s) ;
+
+    # Read the first 1k of data from the blob
+    my $data ;
+    $stream->read($data, 0, 1024);
+
+A BerkeleyDB::DbStream object has the following methods available:
+
+
+=head2 $status = $stream->size($SIZE);
+
+Outputs the length of the Blob in the $SIZE parameter.
+
+=head2 $status = $stream->read($data, $offset, $size);
+
+Read from the blob. $offset is the number of bytes from the start of the
+blob to read from. $size if the number of bytes to read.
+
+=head2 $status = $stream->write($data, $offset, $flags);
+
+Write $data to the blob, starting at offset $offset.
+
+Example
+
+Below is an example of how to walk through a database when you don't know
+beforehand which entries are blobs and which are not.
+
+    while (1)
+    {
+        my $k = '';
+        my $v = '';
+        $cursor->partial_set(0,0) ;
+        my $status = $cursor->c_get($k, $v, DB_NEXT) ;
+        $cursor->partial_clear();
+
+        last if $status != 0 ;
+
+        my $stream = $cursor->db_stream(DB_STREAM_WRITE);
+
+        if (defined $stream)
+        {
+            # It's a Blob
+            $stream->size(my $s) ;
+        }
+        else
+        {
+            # Not a Blob
+            $cursor->c_get($k, $v, DB_CURRENT) ;
+        }
+    }
 
 =head1 Berkeley DB Concurrent Data Store (CDS)
 
@@ -2320,7 +2462,7 @@ The official web site for Berkeley DB is F<http://www.oracle.com/technology/prod
 
 =head1 COPYRIGHT
 
-Copyright (c) 1997-2004 Paul Marquess. All rights reserved. This program
+Copyright (c) 1997-2013 Paul Marquess. All rights reserved. This program
 is free software; you can redistribute it and/or modify it under the
 same terms as Perl itself.
 
diff --git a/lang/perl/BerkeleyDB/BerkeleyDB.xs b/lang/perl/BerkeleyDB/BerkeleyDB.xs
index 9290487d..5f64888a 100644
--- a/lang/perl/BerkeleyDB/BerkeleyDB.xs
+++ b/lang/perl/BerkeleyDB/BerkeleyDB.xs
@@ -1,21 +1,15 @@
 /*
 
- BerkeleyDB.xs -- Perl 5 interface to Berkeley DB version 2, 3 & 4
+ BerkeleyDB.xs -- Perl 5 interface to Berkeley DB version 2, 3, 4, 5 & 6
 
  written by Paul Marquess <pmqs@cpan.org>
 
  All comments/suggestions/problems are welcome
 
-     Copyright (c) 1997-2011 Paul Marquess. All rights reserved.
+     Copyright (c) 1997-2013 Paul Marquess. All rights reserved.
      This program is free software; you can redistribute it and/or
      modify it under the same terms as Perl itself.
 
-     Please refer to the COPYRIGHT section in
-
- Changes:
-        0.01 -  First Alpha Release
-        0.02 -
-
 */
 
 
@@ -24,6 +18,7 @@
 extern "C" {
 #endif
 
+#define PERL_NO_GET_CONTEXT
 #define PERL_POLLUTE
 #include "EXTERN.h"
 #include "perl.h"
@@ -57,6 +52,15 @@ extern "C" {
 # define SvUTF8_off(x)
 #endif
 
+#if PERL_REVISION == 5 && (PERL_VERSION < 8 || (PERL_VERSION == 8 && PERL_SUBVERSION < 4 ))
+
+#    ifdef SvPVbyte_force
+#        undef SvPVbyte_force
+#    endif
+
+#    define SvPVbyte_force(sv,lp) SvPV_force(sv,lp)
+
+#endif
 /* Being the Berkeley DB we prefer the <sys/cdefs.h> (which will be
  * shortly #included by the <db.h>) __attribute__ to the possibly
  * already defined __attribute__, for example by GNUC or by Perl. */
@@ -86,6 +90,10 @@ extern "C" {
 #  error db.h is from Berkeley DB 2.0-2.5 - need at least Berkeley DB 2.6.4
 #endif
 
+#if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR >= 2)
+#  define AT_LEAST_DB_2_2
+#endif
+
 
 #if (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR == 0)
 #  define IS_DB_3_0_x
@@ -161,6 +169,10 @@ extern "C" {
 #  define AT_LEAST_DB_5_3
 #endif
 
+#if DB_VERSION_MAJOR >= 6 
+#  define AT_LEAST_DB_6_0
+#endif
+
 #ifdef __cplusplus
 }
 #endif
@@ -168,7 +180,7 @@ extern "C" {
 #define DBM_FILTERING
 #define STRICT_CLOSE
 /* #define ALLOW_RECNO_OFFSET */
-/* #define TRACE */
+/* #define TRACE  */
 
 #if DB_VERSION_MAJOR == 2 && ! defined(DB_LOCK_DEADLOCK)
 #  define DB_LOCK_DEADLOCK	EAGAIN
@@ -202,13 +214,20 @@ typedef struct {
 
 
         void *(*db_malloc) __P((size_t));
-        int (*dup_compare)
-            __P((DB_callback const DBT *, const DBT *));
 
         u_int32_t        bt_maxkey;
         u_int32_t        bt_minkey;
+#ifdef AT_LEAST_DB_6_0
+        int (*bt_compare)
+            __P((DB_callback const DBT *, const DBT *, size_t *));
+        int (*dup_compare)
+            __P((DB_callback const DBT *, const DBT *, size_t *));
+#else
         int (*bt_compare)
             __P((DB_callback const DBT *, const DBT *));
+        int (*dup_compare)
+            __P((DB_callback const DBT *, const DBT *));
+#endif
         size_t (*bt_prefix)
             __P((DB_callback const DBT *, const DBT *));
 
@@ -230,6 +249,8 @@ typedef struct {
 
         u_int32_t        heapsize_gbytes;
         u_int32_t        heapsize_bytes;
+        u_int32_t        blob_threshold;
+        char            *blob_dir;
 } DB_INFO ;
 
 #endif /* DB_VERSION_MAJOR > 2 */
@@ -342,6 +363,24 @@ typedef struct {
         } BerkeleyDB_Cursor_type;
 
 typedef struct {
+	int		    Status ;
+#ifdef AT_LEAST_DB_6_0
+	DB_STREAM *	stream ;
+#endif
+	int		    active ;
+	u_int32_t	partial ;
+	u_int32_t	dlen ;
+	u_int32_t	doff ;
+#ifdef DBM_FILTERING
+        SV *    filter_fetch_key ;
+        SV *    filter_store_key ;
+        SV *    filter_fetch_value ;
+        SV *    filter_store_value ;
+        int     filtering ;
+#endif
+	} BerkeleyDB_DbStream_type ;
+
+typedef struct {
 	BerkeleyDB_ENV_type *	env ;
 	} BerkeleyDB_TxnMgr_type ;
 
@@ -366,6 +405,9 @@ typedef int BerkeleyDB_Sequence_type;
 typedef SV* db_seq_t;
 #endif
 
+#ifndef DB_DBT_APPMALLOC
+#define DB_DBT_APPMALLOC 0
+#endif
 
 typedef BerkeleyDB_ENV_type *	BerkeleyDB__Env ;
 typedef BerkeleyDB_ENV_type *	BerkeleyDB__Env__Raw ;
@@ -399,6 +441,15 @@ typedef BerkeleyDB_Sequence_type * 	BerkeleyDB__Sequence ;
 #else
 typedef int * 	BerkeleyDB__Sequence ;
 #endif
+//#ifdef AT_LEAST_DB_6_0
+typedef BerkeleyDB_DbStream_type   	BerkeleyDB__DbStream_type ;
+typedef BerkeleyDB_DbStream_type * 	BerkeleyDB__DbStream ;
+typedef BerkeleyDB_DbStream_type * 	BerkeleyDB__DbStream__Raw ;
+//#else
+//typedef int   	BerkeleyDB__DbStream_type ;
+//typedef int * 	BerkeleyDB__DbStream ;
+//typedef int * 	BerkeleyDB__DbStream__Raw ;
+//#endif
 #if 0
 typedef DB_LOG *      		BerkeleyDB__Log ;
 typedef DB_LOCKTAB *  		BerkeleyDB__Lock ;
@@ -407,9 +458,11 @@ typedef DBT 			DBTKEY ;
 typedef DBT 			DBT_OPT ;
 typedef DBT 			DBT_B ;
 typedef DBT 			DBTKEY_B ;
+typedef DBT 			DBTKEY_B4Blob ;
 typedef DBT 			DBTKEY_Br ;
 typedef DBT 			DBTKEY_Bpr ;
 typedef DBT 			DBTKEY_seq ;
+typedef DBT 			DBT_Blob ;
 typedef DBT 			DBTVALUE ;
 typedef void *	      		PV_or_NULL ;
 typedef PerlIO *      		IO_or_NULL ;
@@ -465,6 +518,10 @@ typedef	int db_timeout_t ;
 
 #endif
 
+#ifndef AT_LEAST_DB_6_0
+typedef	int db_off_t;
+#endif
+
 #define ERR_BUFF "BerkeleyDB::Error"
 
 #define ZMALLOC(to, typ) ((to = (typ *)safemalloc(sizeof(typ))), \
@@ -552,6 +609,14 @@ typedef	int db_timeout_t ;
           }                                                     \
         }
 
+#define OutputKeyBlob(arg, name)                                    \
+        { if (RETVAL) 					\
+          {                                                     \
+              my_sv_setpvn(arg, name.data, name.size) ;         \
+              DBM_ckFilter(arg, filter_fetch_key, "filter_fetch_key") ;            \
+          }                                                     \
+        }
+
 #ifdef AT_LEAST_DB_4_3
 
 #define InputKey_seq(arg, var)  \
@@ -646,6 +711,7 @@ typedef	int db_timeout_t ;
 #define ckActive_Environment(a)	ckActive(a, "Environment")
 #define ckActive_TxnMgr(a)	ckActive(a, "Transaction Manager")
 #define ckActive_Transaction(a) ckActive(a, "Transaction")
+#define ckActive_DbStream(a) ckActive(a, "DB_STREAM")
 #define ckActive_Database(a) 	ckActive(a, "Database")
 #define ckActive_Cursor(a) 	ckActive(a, "Cursor")
 #ifdef AT_LEAST_DB_4_3
@@ -783,7 +849,9 @@ my_db_strerror(int err)
 static void
 close_everything(void)
 {
-    dTHR;
+#ifdef dTHX
+    dTHX;
+#endif    
     Trace(("close_everything\n")) ;
     /* Abort All Transactions */
     {
@@ -797,7 +865,7 @@ close_everything(void)
 	Trace(("BerkeleyDB::Term::close_all_txns dirty=%d\n", PL_dirty)) ;
 	while ( (he = hv_iternext(hv)) ) {
 	    tid = * (BerkeleyDB__Txn__Raw *) hv_iterkey(he, &len) ;
-	    Trace(("  Aborting Transaction [%d] in [%d] Active [%d]\n", tid->txn, tid, tid->active));
+	    Trace(("  Aborting Transaction [%p] in [%p] Active [%d]\n", tid->txn, tid, tid->active));
 	    if (tid->active) {
 #ifdef AT_LEAST_DB_4
 	    tid->txn->abort(tid->txn) ;
@@ -812,6 +880,31 @@ close_everything(void)
 	Trace(("End of BerkeleyDB::Term::close_all_txns aborted %d of %d transactios\n",closed, all)) ;
     }
 
+#ifdef AT_LEAST_DB_6_0
+    /* Close All DB_STREAM */
+    {
+        BerkeleyDB__DbStream db ;
+        HE * he ;
+        I32 len ;
+        HV * hv = perl_get_hv("BerkeleyDB::Term::DbStream", TRUE);
+        int  all = 0 ;
+        int  closed = 0 ;
+        (void) hv_iterinit(hv) ;
+        Trace(("BerkeleyDB::DbStream::close_all_dbstream \n")) ;
+        while ( (he = hv_iternext(hv)) ) {
+            db = * (BerkeleyDB__DbStream*) hv_iterkey(he, &len) ;
+            Trace(("  Closing DbStream [%p] in [%p] Active [%d]\n", db->stream, db, db->active));
+            if (db->active) {
+                (db->stream->close)(db->stream, 0);
+                ++ closed ;
+            }
+            db->active = FALSE ;
+            ++ all ;
+        }
+        Trace(("End of BerkeleyDB::Term::close_all_dbstream closed %d of %d streams\n",closed, all)) ;
+    }
+#endif
+
     /* Close All Cursors */
     {
 	BerkeleyDB__Cursor db ;
@@ -824,7 +917,7 @@ close_everything(void)
 	Trace(("BerkeleyDB::Term::close_all_cursors \n")) ;
 	while ( (he = hv_iternext(hv)) ) {
 	    db = * (BerkeleyDB__Cursor*) hv_iterkey(he, &len) ;
-	    Trace(("  Closing Cursor [%d] in [%d] Active [%d]\n", db->cursor, db, db->active));
+	    Trace(("  Closing Cursor [%p] in [%p] Active [%d]\n", db->cursor, db, db->active));
 	    if (db->active) {
     	        ((db->cursor)->c_close)(db->cursor) ;
 		++ closed ;
@@ -847,7 +940,7 @@ close_everything(void)
 	Trace(("BerkeleyDB::Term::close_all_dbs\n" )) ;
 	while ( (he = hv_iternext(hv)) ) {
 	    db = * (BerkeleyDB*) hv_iterkey(he, &len) ;
-	    Trace(("  Closing Database [%d] in [%d] Active [%d]\n", db->dbp, db, db->active));
+	    Trace(("  Closing Database [%p] in [%p] Active [%d]\n", db->dbp, db, db->active));
 	    if (db->active) {
 	        (db->dbp->close)(db->dbp, 0) ;
 		++ closed ;
@@ -870,7 +963,7 @@ close_everything(void)
 	Trace(("BerkeleyDB::Term::close_all_envs\n")) ;
 	while ( (he = hv_iternext(hv)) ) {
 	    env = * (BerkeleyDB__Env*) hv_iterkey(he, &len) ;
-	    Trace(("  Closing Environment [%d] in [%d] Active [%d]\n", env->Env, env, env->active));
+	    Trace(("  Closing Environment [%p] in [%p] Active [%d]\n", env->Env, env, env->active));
 	    if (env->active) {
 #if DB_VERSION_MAJOR == 2
                 db_appexit(env->Env) ;
@@ -892,7 +985,9 @@ close_everything(void)
 static void
 destroyDB(BerkeleyDB db)
 {
-    dTHR;
+#ifdef dTHX
+    dTHX;
+#endif    
     if (! PL_dirty && db->active) {
 	if (db->parent_env && db->parent_env->open_dbs)
 	    -- db->parent_env->open_dbs ;
@@ -949,7 +1044,8 @@ softCrash(const char *pat, ...)
 
     vsprintf(buffer2, buffer1, args) ;
 
-    croak(buffer2);
+    /* Silence warning if -Werror=format-security enabled */
+    croak("%s", buffer2);
 
     /* NOTREACHED */
     va_end(args);
@@ -960,9 +1056,11 @@ softCrash(const char *pat, ...)
 static I32
 GetArrayLength(BerkeleyDB db)
 {
+    I32		RETVAL = 0 ;
+#ifndef AT_LEAST_DB_3_1
     DBT		key ;
     DBT		value ;
-    int		RETVAL = 0 ;
+
     DBC *   	cursor ;
 
     DBT_clear(key) ;
@@ -980,9 +1078,56 @@ GetArrayLength(BerkeleyDB db)
             RETVAL = 0 ;
         cursor->c_close(cursor) ;
     }
-
     Trace(("GetArrayLength got %d\n", RETVAL)) ;
     return ((I32)RETVAL) ;
+
+#else
+    DB_BTREE_STAT *	stat ;
+#ifdef AT_LEAST_DB_4_3
+    db->Status = ((db->dbp)->stat)(db->dbp, db->txn, &stat, 0) ;
+#else        
+#ifdef AT_LEAST_DB_3_3
+    db->Status = ((db->dbp)->stat)(db->dbp, &stat, 0) ;
+#else
+    db->Status = ((db->dbp)->stat)(db->dbp, &stat, safemalloc, 0) ;
+#endif
+#endif
+    if (db->Status == 0)
+    {
+        RETVAL = (I32)stat->bt_nkeys ;
+    }
+
+    Trace(("GetArrayLength got %d\n", stat->bt_nkeys)) ;
+    return (RETVAL);
+
+#endif
+}
+
+static I32
+GetQueueLength(BerkeleyDB db)
+{
+#ifndef AT_LEAST_DB_3_3
+    return 0;
+#else
+    I32		RETVAL = 0 ;
+    DB_QUEUE_STAT *	stat ;
+#ifdef AT_LEAST_DB_4_3
+    db->Status = ((db->dbp)->stat)(db->dbp, db->txn, &stat, 0) ;
+#else        
+#ifdef AT_LEAST_DB_3_3
+    db->Status = ((db->dbp)->stat)(db->dbp, &stat, 0) ;
+#else
+    db->Status = ((db->dbp)->stat)(db->dbp, &stat, safemalloc, 0) ;
+#endif
+#endif
+    if (db->Status == 0)
+    {
+        RETVAL = (I32)stat->qs_nkeys ;
+    }
+
+    Trace(("GetQueueLength got %d\n", stat->qs_nkeys)) ;
+    return (RETVAL);
+#endif
 }
 
 #if 0
@@ -1069,7 +1214,11 @@ GetInternalObject(SV * sv)
 #endif
 
 static int
+#ifdef AT_LEAST_DB_6_0
+btree_compare(DB_callback const DBT * key1, const DBT * key2, size_t * locp)
+#else
 btree_compare(DB_callback const DBT * key1, const DBT * key2 )
+#endif
 {
 #ifdef dTHX
     dTHX;
@@ -1125,7 +1274,11 @@ btree_compare(DB_callback const DBT * key1, const DBT * key2 )
 }
 
 static int
+#ifdef AT_LEAST_DB_6_0
+dup_compare(DB_callback const DBT * key1, const DBT * key2, size_t *locp )
+#else
 dup_compare(DB_callback const DBT * key1, const DBT * key2 )
+#endif
 {
 #ifdef dTHX
     dTHX;
@@ -1293,15 +1446,11 @@ associate_cb(DB_callback const DBT * pkey, const DBT * pdata, DBT * skey)
     dSP ;
     dMY_CXT ;    
     char * pk_dat, * pd_dat ;
-    /* char *sk_dat ; */
     int retval ;
     int count ;
-    int i ;
     SV * skey_SV ;
     STRLEN skey_len;
     char * skey_ptr ;
-    AV * skey_AV;
-    DBT * tkey;
 
     Trace(("In associate_cb \n")) ;
     if (getCurrentDB->associated == NULL){
@@ -1374,7 +1523,7 @@ associate_cb(DB_callback const DBT * pkey, const DBT * pdata, DBT * skey)
                     skey->size = skey_len;
                     skey->data = (char*)safemalloc(skey_len);
                     memcpy(skey->data, skey_ptr, skey_len);
-                    Trace(("key is %d -- %.*s\n", skey->size, skey->size, skey->data));
+                    Trace(("key is %d -- %.*s\n", skey->size, skey->size, (char*)skey->data));
                 } else {
                     skey->flags |= DB_DBT_MULTIPLE ;
 
@@ -1391,7 +1540,7 @@ associate_cb(DB_callback const DBT * pkey, const DBT * pdata, DBT * skey)
                         dbts[i].data = (char *)safemalloc(skey_len);
                         memcpy(dbts[i].data, skey_ptr, skey_len);
 
-                        Trace(("key is %d -- %.*s\n", dbts[i].size, dbts[i].size, dbts[i].data));
+                        Trace(("key is %d -- %.*s\n", dbts[i].size, dbts[i].size, (char*)dbts[i].data));
                     }
                     Trace(("mkey has %d subkeys\n", skey->size));
                 }
@@ -1409,7 +1558,7 @@ associate_cb(DB_callback const DBT * pkey, const DBT * pdata, DBT * skey)
             memcpy(skey->data, skey_ptr, skey_len);
         }
     }
-    Trace(("key is %d -- %.*s\n", skey->size, skey->size, skey->data));
+    Trace(("key is %d -- %.*s\n", skey->size, skey->size, (char*)skey->data));
 
     FREETMPS ;
     LEAVE ;
@@ -1426,13 +1575,9 @@ associate_cb_recno(DB_callback const DBT * pkey, const DBT * pdata, DBT * skey)
     dSP ;
     dMY_CXT ;    
     char * pk_dat, * pd_dat ;
-    /* char *sk_dat ; */
     int retval ;
     int count ;
     SV * skey_SV ;
-    STRLEN skey_len;
-    char * skey_ptr ;
-    /* db_recno_t Value; */
 
     Trace(("In associate_cb_recno \n")) ;
     if (getCurrentDB->associated == NULL){
@@ -1525,12 +1670,9 @@ associate_foreign_cb(DB* db, const DBT * key, DBT * data, const DBT * foreignkey
     char * k_dat, * d_dat, * f_dat;
     int retval ;
     int count ;
-    int i ;
     SV * changed_SV ;
     STRLEN skey_len;
     char * skey_ptr ;
-    AV * skey_AV;
-    DBT * tkey;
     SV* data_sv ;
 
     Trace(("In associate_foreign_cb \n")) ;
@@ -1615,12 +1757,7 @@ associate_foreign_cb_recno(DB* db, const DBT * key, DBT * data, const DBT * fore
     char * k_dat, * d_dat, * f_dat;
     int retval ;
     int count ;
-    int i ;
     SV * changed_SV ;
-    STRLEN skey_len;
-    char * skey_ptr ;
-    AV * skey_AV;
-    DBT * tkey;
     SV* data_sv ;
 
     Trace(("In associate_foreign_cb \n")) ;
@@ -1703,6 +1840,9 @@ db_errcall_cb(const DB_ENV* dbenv, const char * db_errpfx, const char * buffer)
 db_errcall_cb(const char * db_errpfx, char * buffer)
 #endif
 {
+#ifdef dTHX
+    dTHX;
+#endif    
     SV * sv;
 
     Trace(("In errcall_cb \n")) ;
@@ -1747,6 +1887,9 @@ db_isalive_cb(DB_ENV *dbenv, pid_t pid, db_threadid_t tid, u_int32_t flags)
 static SV *
 readHash(HV * hash, char * key)
 {
+#ifdef dTHX
+    dTHX;
+#endif    
     SV **       svp;
     svp = hv_fetch(hash, key, strlen(key), FALSE);
 
@@ -1763,6 +1906,9 @@ readHash(HV * hash, char * key)
 static void
 hash_delete(char * hash, char * key)
 {
+#ifdef dTHX
+    dTHX;
+#endif    
     HV * hv = perl_get_hv(hash, TRUE);
     (void) hv_delete(hv, (char*)&key, sizeof(key), G_DISCARD);
 }
@@ -1770,6 +1916,9 @@ hash_delete(char * hash, char * key)
 static void
 hash_store_iv(char * hash, char * key, IV value)
 {
+#ifdef dTHX
+    dTHX;
+#endif    
     HV * hv = perl_get_hv(hash, TRUE);
     (void)hv_store(hv, (char*)&key, sizeof(key), newSViv(value), 0);
     /* printf("hv_store returned %d\n", ret) ; */
@@ -1778,6 +1927,9 @@ hash_store_iv(char * hash, char * key, IV value)
 static void
 hv_store_iv(HV * hash, char * key, IV value)
 {
+#ifdef dTHX
+    dTHX;
+#endif    
     hv_store(hash, key, strlen(key), newSViv(value), 0);
 }
 
@@ -1792,6 +1944,9 @@ hv_store_uv(HV * hash, char * key, UV value)
 static void
 GetKey(BerkeleyDB_type * db, SV * sv, DBTKEY * key)
 {
+#ifdef dTHX
+    dTHX;
+#endif    
     dMY_CXT ;    
     if (db->recno_or_queue) {
         Value = GetRecnoKey(db, SvIV(sv)) ; 
@@ -1822,6 +1977,9 @@ my_db_open(
         HV*     hash
 	)
 {
+#ifdef dTHX
+    dTHX;
+#endif    
     DB_ENV *	env    = NULL ;
     BerkeleyDB 	RETVAL = NULL ;
     DB *	dbp ;
@@ -1988,7 +2146,7 @@ my_db_open(
 
     if (info->h_hash) {
         Status = dbp->set_h_hash(dbp, info->h_hash) ;
-	Trace(("set_h_hash [%d] returned %s\n",
+	Trace(("set_h_hash [%p] returned %s\n",
 		info->h_hash, my_db_strerror(Status)));
         if (Status)
             return RETVAL ;
@@ -1997,7 +2155,7 @@ my_db_open(
 
     if (info->dup_compare) {
         Status = dbp->set_dup_compare(dbp, info->dup_compare) ;
-	Trace(("set_dup_compare [%d] returned %s\n",
+	Trace(("set_dup_compare [%p] returned %s\n",
 		info->dup_compare, my_db_strerror(Status)));
         if (Status)
             return RETVAL ;
@@ -2005,7 +2163,7 @@ my_db_open(
 
     if (info->bt_prefix) {
         Status = dbp->set_bt_prefix(dbp, info->bt_prefix) ;
-	Trace(("set_bt_prefix [%d] returned %s\n",
+	Trace(("set_bt_prefix [%p] returned %s\n",
 		info->bt_prefix, my_db_strerror(Status)));
         if (Status)
             return RETVAL ;
@@ -2068,6 +2226,33 @@ my_db_open(
 #endif
     }
 
+		if (info->blob_threshold)
+#ifndef AT_LEAST_DB_6_0
+			softCrash("-BlobThreshold needs Berkeley DB 6.0 or better") ;
+#else
+	  {
+          Status = dbp->set_blob_threshold(dbp, info->blob_threshold, 0);
+		  Trace(("ENV->set_blob_threshold value = %d returned %s\n", 
+                        info->blob_threshold,
+						my_db_strerror(Status))) ;
+        if (Status)
+            return RETVAL ;
+      }
+
+#endif /* ! AT_LEAST_DB_6_0 */
+		if (info->blob_dir)
+#ifndef AT_LEAST_DB_6_0
+			softCrash("-BlobDir needs Berkeley DB 6.0 or better") ;
+#else
+	  {
+          Status = dbp->set_blob_dir(dbp, info->blob_dir);
+		  Trace(("ENV->set_blob_dir value = %s returned %s\n", info->blob_dir,
+						my_db_strerror(Status))) ;
+        if (Status)
+            return RETVAL ;
+      }
+#endif /* ! AT_LEAST_DB_6_0 */
+
     /* In-memory database need DB_CREATE from 4.4 */
     if (! file)
         flags |= DB_CREATE;
@@ -2250,6 +2435,9 @@ _db_verify(ref)
                 RETVAL = db_create(&dbp, dbenv, 0) ;
 	        if (RETVAL == 0) {
 	            RETVAL = dbp->verify(dbp, db, subdb, ofh, flags) ;
+#ifndef AT_LEAST_DB_4_2 
+                dbp->close(dbp, 0) ; 
+#endif
 	        }
 	        if (outfile) 
                     fclose(ofh);
@@ -2349,7 +2537,7 @@ open(env, db_home=NULL, flags=0, mode=0777)
 	  dMY_CXT;
     CODE:
 #ifndef AT_LEAST_DB_4_1
-	    softCrash("$env->create needs Berkeley DB 4.1 or better") ;
+	    softCrash("$env->open needs Berkeley DB 4.1 or better") ;
 #else
         RETVAL = env->Env->open(env->Env, db_home, flags, mode);
 	env->opened = TRUE;
@@ -2381,7 +2569,23 @@ set_encrypt(env, passwd, flags)
 #else
         dieIfEnvOpened(env, "set_encrypt");
         RETVAL = env->Env->set_encrypt(env->Env, passwd, flags);
-	env->opened = TRUE;
+#endif
+    OUTPUT:
+        RETVAL
+
+
+int
+set_blob_threshold(env, bytes, flags=0)
+	BerkeleyDB::Env env
+	u_int32_t bytes
+	u_int32_t flags
+	PREINIT:
+	  dMY_CXT;
+    CODE:
+#ifndef AT_LEAST_DB_6_0
+	    softCrash("$env->set_blob_threshold needs Berkeley DB 6.0 or better") ;
+#else
+        RETVAL = env->Env->set_blob_threshold(env->Env, bytes, flags);
 #endif
     OUTPUT:
         RETVAL
@@ -2420,11 +2624,13 @@ _db_appinit(self, ref, errfile=NULL)
 	    char*	temp_dir = 0;
 	    SV *	msgfile = NULL ;
         int     thread_count = 0 ;
+        int     blob_threshold = 0 ;
+	    char*	blob_dir = 0;
 	    SV *	errprefix = NULL;
 	    DB_ENV *	env ;
 	    int status ;
 
-	    Trace(("in _db_appinit [%s] %d\n", self, ref)) ;
+	    Trace(("in _db_appinit [%s] %p\n", self, ref)) ;
 	    hash = (HV*) SvRV(ref) ;
 	    SetValue_pv(home,      "Home", char *) ;
 	    SetValue_pv(enc_passwd,"Enc_Passwd", char *) ;
@@ -2443,6 +2649,8 @@ _db_appinit(self, ref, errfile=NULL)
 	    SetValue_iv(max_objects,"MaxObjects") ;
 	    SetValue_iv(shm_key,   "SharedMemKey") ;
 		SetValue_iv(thread_count,   "ThreadCount") ;
+		SetValue_iv(blob_threshold,   "BlobThreshold") ;
+	    SetValue_pv(blob_dir,   "BlobDir", char*) ;
 	    SetValue_pv(data_dir,   "DB_DATA_DIR", char*) ;
 	    SetValue_pv(temp_dir,   "DB_TEMP_DIR", char*) ;
 	    SetValue_pv(log_dir,    "DB_LOG_DIR", char*) ;
@@ -2487,7 +2695,13 @@ _db_appinit(self, ref, errfile=NULL)
 		if (log_config)
 			softCrash("-LogConfig needs Berkeley DB 4.7 or better") ;
 #endif /* ! AT_LEAST_DB_4_7 */
-	    Trace(("_db_appinit(config=[%d], home=[%s],errprefix=[%s],flags=[%d]\n",
+#ifndef AT_LEAST_DB_6_0
+		if (blob_threshold)
+			softCrash("-BlobThreshold needs Berkeley DB 6.0 or better") ;
+		if (blob_dir)
+			softCrash("-BlobDir needs Berkeley DB 6.0 or better") ;
+#endif /* ! AT_LEAST_DB_6_0 */
+	    Trace(("_db_appinit(config=[%p], home=[%s],errprefix=[%p],flags=[%d]\n",
 			config, home, errprefix, flags)) ;
 #ifdef TRACE
 	    if (config) {
@@ -2522,7 +2736,7 @@ _db_appinit(self, ref, errfile=NULL)
 	    if (SvOK(errfile)) {
 	        FILE * ef = GetFILEptr(errfile) ;
 	    	if (! ef)
-		    croak("Cannot open file ErrFile", Strerror(errno));
+		    croak("Cannot open file ErrFile: %s", Strerror(errno));
 		RETVAL->ErrHandle = newSVsv(errfile) ;
 	    	env->db_errfile = ef;
 	    }
@@ -2568,7 +2782,7 @@ _db_appinit(self, ref, errfile=NULL)
 #ifdef AT_LEAST_DB_3_1
 	  if (status == 0 && shm_key) {
 	      status = env->set_shm_key(env, shm_key) ;
-	      Trace(("set_shm_key [%d] returned %s\n", shm_key,
+	      Trace(("set_shm_key [%ld] returned %s\n", shm_key,
 			my_db_strerror(status)));
 	  }
 
@@ -2680,7 +2894,20 @@ _db_appinit(self, ref, errfile=NULL)
 						my_db_strerror(status))) ;
 	  }
 #endif
-
+#ifdef AT_LEAST_DB_6_0
+	  if (blob_threshold && status == 0)
+	  {
+          status = env->set_blob_threshold(env, blob_threshold, 0);
+		  Trace(("ENV->set_blob_threshold value = %d returned %s\n", blob_threshold,
+						my_db_strerror(status))) ;
+      }
+	  if (blob_dir && status == 0)
+	  {
+          status = env->set_blob_dir(env, blob_dir);
+		  Trace(("ENV->set_blob_dir value = %s returned %s\n", blob_dir,
+						my_db_strerror(status))) ;
+      }
+#endif
 	  if (status == 0)
 	  {
 	    int		mode = 0 ;
@@ -2698,7 +2925,7 @@ _db_appinit(self, ref, errfile=NULL)
 	    if (SvOK(errfile)) {
 	        FILE * ef = GetFILEptr(errfile);
 	    	if (! ef)
-		    croak("Cannot open file ErrFile", Strerror(errno));
+		    croak("Cannot open file ErrFile: %s", Strerror(errno));
 		RETVAL->ErrHandle = newSVsv(errfile) ;
 	    	env->set_errfile(env, ef) ;
 
@@ -2710,7 +2937,7 @@ _db_appinit(self, ref, errfile=NULL)
 	        if (SvOK(msgfile)) {
 	            FILE * ef = GetFILEptr(msgfile);
 	    	    if (! ef)
-		        croak("Cannot open file MsgFile", Strerror(errno));
+		        croak("Cannot open file MsgFile: %s", Strerror(errno));
 		    RETVAL->MsgHandle = newSVsv(msgfile) ;
 	    	    env->set_msgfile(env, ef) ;
 	        }
@@ -2725,7 +2952,7 @@ _db_appinit(self, ref, errfile=NULL)
 #else /* > 3.0 */
 	    status = (env->open)(env, home, flags, mode) ;
 #endif
-	    Trace(("ENV->open(env=%s,home=%s,flags=%d,mode=%d)\n",env,home,flags,mode)) ;
+	    Trace(("ENV->open(env=%p,home=%s,flags=%d,mode=%d)\n",env,home,flags,mode)) ;
 	    Trace(("ENV->open returned %s\n", my_db_strerror(status))) ;
 	  }
 
@@ -2854,7 +3081,7 @@ _txn_begin(env, pid=NULL, flags=0)
 	{
 	    DB_TXN *txn ;
 	    DB_TXN *p_id = NULL ;
-	    Trace(("txn_begin pid %d, flags %d\n", pid, flags)) ;
+	    Trace(("txn_begin pid %p, flags %d\n", pid, flags)) ;
 #if DB_VERSION_MAJOR == 2
 	    if (env->Env->tx_info == NULL)
 		softCrash("Transaction Manager not enabled") ;
@@ -3054,7 +3281,7 @@ _DESTROY(env)
 	  dMY_CXT;
 	CODE:
 	  Trace(("In BerkeleyDB::Env::DESTROY\n"));
-	  Trace(("    env %ld Env %ld dirty %d\n", env, &env->Env, PL_dirty)) ;
+	  Trace(("    env %p Env %p dirty %d\n", env, &env->Env, PL_dirty)) ;
 	  if (env->active)
 #if DB_VERSION_MAJOR == 2
               db_appexit(env->Env) ;
@@ -3286,8 +3513,8 @@ lock_detect(env, atype=DB_LOCK_DEFAULT, flags=0)
    INIT:
        ckActive_Database(env->active) ;
    CODE:
-#ifndef AT_LEAST_DB_2_2
-	    softCrash("$env->lock_detect needs Berkeley DB 2.2.x or better") ;
+#ifndef AT_LEAST_DB_4
+	    softCrash("$env->lock_detect needs Berkeley DB 4.x or better") ;
 #else
        RETVAL = env->Status = env->Env->lock_detect(env->Env,flags,atype,NULL);
 #endif
@@ -3432,7 +3659,39 @@ set_isalive(env)
 	OUTPUT:
 		RETVAL
 
-            
+
+DualType
+get_blob_threshold(env, bytes)
+	BerkeleyDB::Env	env
+	u_int32_t bytes = NO_INIT
+	PREINIT:
+	  dMY_CXT;
+    CODE:
+#ifndef AT_LEAST_DB_6_0
+	    softCrash("$env->get_blob_threshold needs Berkeley DB 6.0 or better") ;
+#else
+        RETVAL = env->Env->get_blob_threshold(env->Env, &bytes);
+#endif
+    OUTPUT:
+        RETVAL
+        bytes
+
+DualType
+get_blob_dir(env, dir)
+	BerkeleyDB::Env	env
+	char* dir = NO_INIT
+	PREINIT:
+	  dMY_CXT;
+    CODE:
+#ifndef AT_LEAST_DB_6_0
+	    softCrash("$env->get_blob_dir needs Berkeley DB 6.0 or better") ;
+#else
+        RETVAL = env->Env->get_blob_dir(env->Env, (const char**)&dir);
+#endif
+    OUTPUT:
+        RETVAL
+        dir
+
         
 
 MODULE = BerkeleyDB::Term		PACKAGE = BerkeleyDB::Term
@@ -3492,6 +3751,10 @@ _db_open_hash(self, ref)
 	    SetValue_iv(info.h_ffactor, "Ffactor") ;
 	    SetValue_iv(info.h_nelem, "Nelem") ;
 	    SetValue_iv(info.flags, "Property") ;
+#ifdef AT_LEAST_DB_6_0
+	    SetValue_iv(info.blob_threshold, "BlobThreshold") ;
+	    SetValue_pv(info.blob_dir, "BlobDir", char*) ;
+#endif
 	    ZMALLOC(db, BerkeleyDB_type) ;
 	    if ((sv = readHash(hash, "Hash")) && sv != &PL_sv_undef) {
 		info.h_hash = hash_cb ;
@@ -3678,6 +3941,10 @@ _db_open_btree(self, ref)
 	    SetValue_iv(info.db_pagesize, "Pagesize") ;
 	    SetValue_iv(info.bt_minkey, "Minkey") ;
 	    SetValue_iv(info.flags, "Property") ;
+#ifdef AT_LEAST_DB_6_0
+	    SetValue_iv(info.blob_threshold, "BlobThreshold") ;
+	    SetValue_pv(info.blob_dir, "BlobDir", char*) ;
+#endif
 	    ZMALLOC(db, BerkeleyDB_type) ;
 	    if ((sv = readHash(hash, "Compare")) && sv != &PL_sv_undef) {
 		Trace(("    Parsed Compare callback\n"));
@@ -3828,6 +4095,10 @@ _db_open_heap(self, ref)
 	    SetValue_iv(info.flags, "Property") ;
 	    SetValue_iv(info.heapsize_bytes, "HeapSize") ;
 	    SetValue_iv(info.heapsize_gbytes, "HeapSizeGb") ;
+#ifdef AT_LEAST_DB_6_0
+	    SetValue_iv(info.blob_threshold, "BlobThreshold") ;
+	    SetValue_pv(info.blob_dir, "BlobDir", char*) ;
+#endif
 	    ZMALLOC(db, BerkeleyDB_type) ;
 	    RETVAL = my_db_open(db, ref, ref_dbenv, dbenv, txn, file, subname, 
                 DB_HEAP, flags, mode, &info, enc_passwd, enc_flags, hash) ;
@@ -4044,7 +4315,7 @@ db_close(db,flags=0)
 	    ckActive_Database(db->active) ;
 	    saveCurrentDB(db) ;
 	CODE:
-	    Trace(("BerkeleyDB::Common::db_close %d\n", db));
+	    Trace(("BerkeleyDB::Common::db_close %p\n", db));
 #ifdef STRICT_CLOSE
 	    if (db->txn)
 		softCrash("attempted to close a database while a transaction was still open") ;
@@ -4074,7 +4345,7 @@ dab__DESTROY(db)
 	  dMY_CXT;
 	CODE:
 	  saveCurrentDB(db) ;
-	  Trace(("In BerkeleyDB::Common::_DESTROY db %d dirty=%d\n", db, PL_dirty)) ;
+	  Trace(("In BerkeleyDB::Common::_DESTROY db %p dirty=%d\n", db, PL_dirty)) ;
 	  destroyDB(db) ;
 	  Trace(("End of BerkeleyDB::Common::DESTROY \n")) ;
 
@@ -4421,7 +4692,7 @@ db_del(db, key, flags=0)
 	PREINIT:
 	  dMY_CXT;
 	INIT:
-	    Trace(("db_del db[%p] in [%p] txn[%p] key[%.*s] flags[%d]\n", db->dbp, db, db->txn, key.size, key.data, flags)) ;
+	    Trace(("db_del db[%p] in [%p] txn[%p] key[%.*s] flags[%d]\n", db->dbp, db, db->txn, key.size, (char*)key.data, flags)) ;
 	    ckActive_Database(db->active) ;
 	    saveCurrentDB(db) ;
 
@@ -4449,7 +4720,7 @@ db_get(db, key, data, flags=0)
 	  ckActive_Database(db->active) ;
 	  saveCurrentDB(db) ;
 	  SetPartial(data,db) ;
-	  Trace(("db_get db[%p] in [%p] txn[%p] key [%.*s] flags[%d]\n", db->dbp, db, db->txn, key.size, key.data, flags)) ;
+	  Trace(("db_get db[%p] in [%p] txn[%p] key [%.*s] flags[%d]\n", db->dbp, db, db->txn, key.size, (char*)key.data, flags)) ;
 	  RETVAL = db_get(db, key, data, flags);
 	  Trace(("  RETVAL %d\n", RETVAL));
 	OUTPUT:
@@ -4472,7 +4743,7 @@ db_exists(db, key, flags=0)
 #else
 	  ckActive_Database(db->active) ;
 	  saveCurrentDB(db) ;
-	  Trace(("db_exists db[%p] in [%p] txn[%p] key [%.*s] flags[%d]\n", db->dbp, db, db->txn, key.size, key.data, flags)) ;
+	  Trace(("db_exists db[%p] in [%p] txn[%p] key [%.*s] flags[%d]\n", db->dbp, db, db->txn, key.size, (char*)key.data, flags)) ;
 	  RETVAL = db_exists(db, key, flags);
 	  Trace(("  RETVAL %d\n", RETVAL));
 #endif
@@ -4522,7 +4793,7 @@ db_put(db, key, data, flags=0)
 	  ckActive_Database(db->active) ;
 	  saveCurrentDB(db) ;
 	  /* SetPartial(data,db) ; */
-	  Trace(("db_put db[%p] in [%p] txn[%p] key[%.*s] data [%.*s] flags[%d]\n", db->dbp, db, db->txn, key.size, key.data, data.size, data.data, flags)) ;
+	  Trace(("db_put db[%p] in [%p] txn[%p] key[%.*s] data [%.*s] flags[%d]\n", db->dbp, db, db->txn, key.size, (char*)key.data, data.size, (char*)data.data, flags)) ;
 	  RETVAL = db_put(db, key, data, flags);
 	  Trace(("  RETVAL %d\n", RETVAL));
 	OUTPUT:
@@ -4769,6 +5040,39 @@ compact(db, start=NULL, stop=NULL, c_data=NULL, flags=0, end=NULL)
 	  end		if (RETVAL == 0 && end) OutputValue_B(ST(5), end_key) ;
 
 
+DualType
+get_blob_threshold(db, bytes)
+	BerkeleyDB::Common	db
+	u_int32_t bytes = NO_INIT
+	PREINIT:
+	  dMY_CXT;
+    CODE:
+#ifndef AT_LEAST_DB_6_0
+	    softCrash("$db->get_blob_threshold needs Berkeley DB 6.0 or better") ;
+#else
+        RETVAL = db->dbp->get_blob_threshold(db->dbp, &bytes);
+#endif
+    OUTPUT:
+        RETVAL
+        bytes
+
+DualType
+get_blob_dir(db, dir)
+	BerkeleyDB::Common db
+	char* dir = NO_INIT
+	PREINIT:
+	  dMY_CXT;
+    CODE:
+#ifndef AT_LEAST_DB_6_0
+	    softCrash("$db->get_blob_dir needs Berkeley DB 6.0 or better") ;
+#else
+        RETVAL = db->dbp->get_blob_dir(db->dbp, (const char**)&dir);
+#endif
+    OUTPUT:
+        RETVAL
+        dir
+
+
 MODULE = BerkeleyDB::Cursor              PACKAGE = BerkeleyDB::Cursor	PREFIX = cu_
 
 BerkeleyDB::Cursor::Raw
@@ -4856,7 +5160,7 @@ _DESTROY(db)
 	  dMY_CXT;
 	CODE:
 	  saveCurrentDB(db->parent_db);
-	  Trace(("In BerkeleyDB::Cursor::_DESTROY db %d dirty=%d active=%d\n", db, PL_dirty, db->active));
+	  Trace(("In BerkeleyDB::Cursor::_DESTROY db %p dirty=%d active=%d\n", db, PL_dirty, db->active));
 	  hash_delete("BerkeleyDB::Term::Cursor", (char *)db) ;
 	  if (db->active)
     	      ((db->cursor)->c_close)(db->cursor) ;
@@ -4906,7 +5210,7 @@ cu_c_get(db, key, data, flags=0)
 	  ckActive_Cursor(db->active) ;
 	  /* DBT_clear(key); */
 	  /* DBT_clear(data); */
-	  SetPartial(data,db) ;
+      SetPartial(data,db) ;
 	  Trace(("c_get end\n")) ;
 	OUTPUT:
 	  RETVAL
@@ -4927,7 +5231,7 @@ cu_c_pget(db, key, pkey, data, flags=0)
 #ifndef AT_LEAST_DB_3_3
           softCrash("db_c_pget needs at least Berkeley DB 3.3");
 #else
-	  Trace(("c_pget db [%d] flags [%d]\n", db, flags)) ;
+	  Trace(("c_pget db [%p] flags [%d]\n", db, flags)) ;
 	  saveCurrentDB(db->parent_db);
 	  ckActive_Cursor(db->active) ;
 	  SetPartial(data,db) ;
@@ -4970,7 +5274,7 @@ cu_c_count(db, count, flags=0)
 #ifndef AT_LEAST_DB_3_1
           softCrash("c_count needs at least Berkeley DB 3.1.x");
 #else
-	  Trace(("c_get count [%d] flags [%d]\n", db, flags)) ;
+	  Trace(("c_get count [%p] flags [%d]\n", db, flags)) ;
 	  saveCurrentDB(db->parent_db);
 	  ckActive_Cursor(db->active) ;
 	  RETVAL = cu_c_count(db, count, flags) ;
@@ -4980,6 +5284,217 @@ cu_c_count(db, count, flags=0)
 	  RETVAL
 	  count
 
+void
+partial_set(db, offset, length)
+        BerkeleyDB::Cursor 	db
+	u_int32_t		offset
+	u_int32_t		length
+	PREINIT:
+	  dMY_CXT;
+	INIT:
+          ckActive_Cursor(db->active) ;
+	PPCODE:
+	    if (GIMME == G_ARRAY) {
+		XPUSHs(sv_2mortal(newSViv(db->partial == DB_DBT_PARTIAL))) ;
+		XPUSHs(sv_2mortal(newSViv(db->doff))) ;
+		XPUSHs(sv_2mortal(newSViv(db->dlen))) ;
+	    }
+	    db->partial = DB_DBT_PARTIAL ;
+	    db->doff    = offset ;
+	    db->dlen    = length ;
+
+
+void
+partial_clear(db)
+        BerkeleyDB::Cursor 	db
+	PREINIT:
+	  dMY_CXT;
+	INIT:
+          ckActive_Cursor(db->active) ;
+	PPCODE:
+	    if (GIMME == G_ARRAY) {
+		XPUSHs(sv_2mortal(newSViv(db->partial == DB_DBT_PARTIAL))) ;
+		XPUSHs(sv_2mortal(newSViv(db->doff))) ;
+		XPUSHs(sv_2mortal(newSViv(db->dlen))) ;
+	    }
+	    db->partial =
+	    db->doff    =
+	    db->dlen    = 0 ;
+
+BerkeleyDB::DbStream::Raw
+_db_stream(db, flags)
+    	BerkeleyDB::Cursor	db
+        u_int32_t		flags
+        BerkeleyDB::DbStream 	RETVAL = NULL ;
+	PREINIT:
+	  dMY_CXT;
+	INIT:
+	    saveCurrentDB(db->parent_db);
+	    ckActive_Cursor(db->active) ;
+	CODE:
+	{
+#ifndef AT_LEAST_DB_6_0
+          softCrash("db_stream needs at least Berkeley DB 6.0.x");
+#else
+	  DB_STREAM * stream = NULL ;
+	  db->Status = ((db->cursor)->db_stream)(db->cursor, &stream, flags) ;
+	  if (db->Status == 0){
+	      ZMALLOC(RETVAL, BerkeleyDB__DbStream_type) ;
+	      RETVAL->stream  = stream ;
+	      RETVAL->active  = TRUE ;
+	      hash_store_iv("BerkeleyDB::Term::DbStream", (char *)RETVAL, 1) ;
+	  }
+      else
+      {
+	      Trace(("db_stream [%s]\n", my_db_strerror(db->Status)));
+      }
+#endif	
+	}
+	OUTPUT:
+	  RETVAL
+
+BerkeleyDB::DbStream::Raw
+_c_get_db_stream(db, key, cflags, sflags)
+    	BerkeleyDB::Cursor	db
+        DBTKEY_B4Blob		key 
+        u_int32_t		cflags
+        u_int32_t		sflags
+        BerkeleyDB::DbStream 	RETVAL = NULL ;
+	PREINIT:
+	  dMY_CXT;
+	INIT:
+	    saveCurrentDB(db->parent_db);
+	    ckActive_Cursor(db->active) ;
+	CODE:
+	{
+#ifndef AT_LEAST_DB_6_0
+          softCrash("db_stream needs at least Berkeley DB 6.0.x");
+#else
+	  DBT data;
+	  DB_STREAM * stream = NULL ;
+	  DBT_clear(data); 
+      data.flags = DB_DBT_PARTIAL;
+      db->Status = (db->cursor->c_get)(db->cursor, &key, &data, cflags);
+	  if (db->Status == 0)
+          db->Status = ((db->cursor)->db_stream)(db->cursor, &stream, sflags) ;
+	  /* if (db->Status == EINVAL){
+          db->Status = (db->cursor->c_get)(db->cursor,&key,&data,DB_CURRENT) ;
+      } */
+	  if (db->Status == 0){
+	      ZMALLOC(RETVAL, BerkeleyDB__DbStream_type) ;
+	      RETVAL->stream  = stream ;
+	      RETVAL->active  = TRUE ;
+	      hash_store_iv("BerkeleyDB::Term::DbStream", (char *)RETVAL, 1) ;
+	  }
+      else
+      {
+	      Trace(("db_stream [%s]\n", my_db_strerror(db->Status)));
+      }
+#endif	
+	}
+	OUTPUT:
+	  RETVAL
+	  key
+
+MODULE = BerkeleyDB::DbStream    PACKAGE = BerkeleyDB::DbStream	PREFIX = xx_
+
+void
+DESTROY(dbstream)
+    BerkeleyDB::DbStream	dbstream
+	PREINIT:
+	  dMY_CXT;
+	CODE:
+	  Trace(("In BerkeleyDB::DbStream::_DESTROY db %p active=%d\n", dbstream, dbstream->active));
+	  hash_delete("BerkeleyDB::Term::DbStream", (char *)dbstream) ;
+#ifdef AT_LEAST_DB_6_0
+	  if (dbstream->active)
+    	      ((dbstream->stream)->close)(dbstream->stream, 0) ;
+          Safefree(dbstream) ;
+#endif
+	  Trace(("End of BerkeleyDB::DbStream::_DESTROY\n")) ;
+
+DualType
+close(dbstream, flags=0)
+	BerkeleyDB::DbStream dbstream
+	u_int32_t flags
+	PREINIT:
+	  dMY_CXT;
+	INIT:
+	  ckActive_DbStream(dbstream->active) ;
+    CODE:
+#ifndef AT_LEAST_DB_6_0
+	    softCrash("$dbstream->close needs Berkeley DB 6.0 or better") ;
+#else
+        RETVAL = (dbstream->stream->close)(dbstream->stream, flags);
+        dbstream->active = FALSE;
+        hash_delete("BerkeleyDB::Term::DbStream", (char *)dbstream) ;
+#endif
+    OUTPUT:
+        RETVAL
+
+
+DualType
+read(db, data, offset, size, flags=0)
+	BerkeleyDB::DbStream db
+    DBT_Blob      data 
+	db_off_t offset
+	u_int32_t size
+	u_int32_t flags
+	PREINIT:
+	  dMY_CXT;
+	INIT:
+	  ckActive_DbStream(db->active) ;
+    CODE:
+#ifndef AT_LEAST_DB_6_0
+	    softCrash("$dbstream->read needs Berkeley DB 6.0 or better") ;
+#else
+        data.data = Sv_Grow(ST(1), size);
+        data.ulen = size > data.ulen ? size : data.ulen ;
+        RETVAL = (db->stream->read)(db->stream, &data, offset, size, flags);
+	    Trace(("stream->read [%s]\n", my_db_strerror(db->Status)));
+#endif
+    OUTPUT:
+        RETVAL
+        data
+
+DualType
+write(db, data, offset=0, flags=0)
+	BerkeleyDB::DbStream db
+    DBT      data
+	db_off_t offset
+	u_int32_t flags
+	PREINIT:
+	  dMY_CXT;
+	INIT:
+	  ckActive_DbStream(db->active) ;
+    CODE:
+#ifndef AT_LEAST_DB_6_0
+	    softCrash("$dbstream->write needs Berkeley DB 6.0 or better") ;
+#else
+        RETVAL = (db->stream->write)(db->stream, &data, offset, flags);
+#endif
+    OUTPUT:
+        RETVAL
+
+DualType
+size(dbstream, size, flags=0)
+	BerkeleyDB::DbStream dbstream
+	db_off_t size = NO_INIT
+	u_int32_t flags
+	PREINIT:
+	  dMY_CXT;
+	INIT:
+	  ckActive_DbStream(dbstream->active) ;
+    CODE:
+#ifndef AT_LEAST_DB_6_0
+	    softCrash("$dbstream->size needs Berkeley DB 6.0 or better") ;
+#else
+        RETVAL = dbstream->stream->size(dbstream->stream, &size, flags);
+#endif
+    OUTPUT:
+        RETVAL
+        size
+
 MODULE = BerkeleyDB::TxnMgr           PACKAGE = BerkeleyDB::TxnMgr	PREFIX = xx_
 
 BerkeleyDB::Txn::Raw
@@ -5013,7 +5528,7 @@ _txn_begin(txnmgr, pid=NULL, flags=0)
 	      ZMALLOC(RETVAL, BerkeleyDB_Txn_type) ;
 	      RETVAL->txn  = txn ;
 	      RETVAL->active = TRUE ;
-	      Trace(("_txn_begin created txn [%d] in [%d]\n", txn, RETVAL));
+	      Trace(("_txn_begin created txn [%p] in [%p]\n", txn, RETVAL));
 	      hash_store_iv("BerkeleyDB::Term::Txn", (char *)RETVAL, 1) ;
 	    }
 	    else
@@ -5196,7 +5711,7 @@ _DESTROY(tid)
 	PREINIT:
 	  dMY_CXT;
 	CODE:
-	  Trace(("In BerkeleyDB::Txn::_DESTROY txn [%d] active [%d] dirty=%d\n", tid->txn, tid->active, PL_dirty)) ;
+	  Trace(("In BerkeleyDB::Txn::_DESTROY txn [%p] active [%d] dirty=%d\n", tid->txn, tid->active, PL_dirty)) ;
 	  if (tid->active)
 #ifdef AT_LEAST_DB_4
 	    tid->txn->abort(tid->txn) ;
@@ -5360,7 +5875,7 @@ NEXTKEY(db, key)
 		((db->cursor)->c_get)(db->cursor, &key, &value, DB_NEXT);
 
 	    /* check for end of cursor */
-	    if (RETVAL == DB_NOTFOUND) {
+	    if (db->Status == DB_NOTFOUND) {
 	      ((db->cursor)->c_close)(db->cursor) ;
 	      db->cursor = NULL ;
 	    }
@@ -5368,7 +5883,7 @@ NEXTKEY(db, key)
 	    OutputKey(ST(0), key)
         }
 
-MODULE = BerkeleyDB::_tiedArray        PACKAGE = BerkeleyDB::_tiedArray
+MODULE = BerkeleyDB::Recno        PACKAGE = BerkeleyDB::Recno
 
 I32
 FETCHSIZE(db)
@@ -5381,6 +5896,19 @@ FETCHSIZE(db)
         OUTPUT:
             RETVAL
 
+MODULE = BerkeleyDB::Queue        PACKAGE = BerkeleyDB::Queue
+
+I32
+FETCHSIZE(db)
+        BerkeleyDB::Common         db
+	PREINIT:
+	  dMY_CXT;
+        CODE:
+            saveCurrentDB(db) ;
+            RETVAL = GetQueueLength(db) ;
+        OUTPUT:
+            RETVAL
+
                 
 MODULE = BerkeleyDB::Common  PACKAGE = BerkeleyDB::Common
 
diff --git a/lang/perl/BerkeleyDB/Changes b/lang/perl/BerkeleyDB/Changes
index 17065ea4..b7880bec 100644
--- a/lang/perl/BerkeleyDB/Changes
+++ b/lang/perl/BerkeleyDB/Changes
@@ -1,6 +1,52 @@
 Revision history for Perl extension BerkeleyDB.
 
-0.50  10th DEcember 2011
+0.55  30 March 2014
+
+        * Monor updates for BDB 6.1 
+
+0.54  9th November 2013
+
+        * memory leak in CDS locking routines
+          [RT #90134]
+
+0.53  14th August 2013
+
+        * BerkeleyDB-0.52 fails to build on 5.18.1RC3
+          [RT #87771]
+
+        * typo fixes
+          [RT #86705]
+
+0.52  7th May 2013
+
+        * Updates for BDB 6.0 - Added Blob support
+            - Added BerkeleyDB::DbStream class to interface to Blobs 
+            - Added BlobThreshold & BlobDir option to BerkeleyDB::Env 
+              constructor
+            - Added BlobThreshold & BlobDir option to Hash, Btree & Heap
+              constructors
+            - Added get_blob_threshold method to BerkeleyDB::Env
+            - Added get_blob_dir method to BerkeleyDB::Env
+            - Added get_blob_threshold method to the Hash, Btree & Heap
+            - Added get_blob_dir method to the Hash, Btree & Heap
+
+        * Added method $cursor->set_partial
+        * Added method $cursor->partial_clear
+
+        * $env->lock_detect dies due to incorrect version check
+          [RT #84179]
+
+        * (Memory leak in db_verify() method. (libdb < 4.2))
+          [RT #84409]
+
+        * Fix a few croaks
+
+0.51  19th March 2012
+
+        * Rework FETCHSIZE
+          [RT #75691]
+
+0.50  10th December 2011
 
         * Updates for BDB 5.3
 
@@ -85,6 +131,9 @@ Revision history for Perl extension BerkeleyDB.
         * Fixed issue db_stat when it returned a null pointer.
           (#46312 rt.cpan.org)
 
+        * set_msgfile API
+          (#46313)
+
         * Fixed issue with DNM Filters & UTF8 support.
           Patch supplied by Torsten Foertsch.
 
diff --git a/lang/perl/BerkeleyDB/MANIFEST b/lang/perl/BerkeleyDB/MANIFEST
index ccc1ce91..e571cf56 100644
--- a/lang/perl/BerkeleyDB/MANIFEST
+++ b/lang/perl/BerkeleyDB/MANIFEST
@@ -18,6 +18,7 @@ mkconsts.pl
 mkpod
 ppport.h
 README
+t/blob.t
 t/btree.t
 t/cds.t
 t/db-3.0.t
@@ -69,3 +70,4 @@ patches/5.005_03
 patches/5.6.0
 scan.pl
 META.yml                                 Module meta-data (added by MakeMaker)
+META.json                                Module JSON meta-data (added by MakeMaker)
diff --git a/lang/perl/BerkeleyDB/META.json b/lang/perl/BerkeleyDB/META.json
new file mode 100644
index 00000000..f9f0edcd
--- /dev/null
+++ b/lang/perl/BerkeleyDB/META.json
@@ -0,0 +1,39 @@
+{
+   "abstract" : "Perl extension for Berkeley DB version 2, 3, 4 or 5",
+   "author" : [
+      "Paul Marquess <pmqs@cpan.org>"
+   ],
+   "dynamic_config" : 1,
+   "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921",
+   "license" : [
+      "perl_5"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : "2"
+   },
+   "name" : "BerkeleyDB",
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
+   "prereqs" : {
+      "build" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "runtime" : {
+         "requires" : {}
+      }
+   },
+   "release_status" : "stable",
+   "version" : "0.55"
+}
diff --git a/lang/perl/BerkeleyDB/META.yml b/lang/perl/BerkeleyDB/META.yml
index aacfed37..661e49a2 100644
--- a/lang/perl/BerkeleyDB/META.yml
+++ b/lang/perl/BerkeleyDB/META.yml
@@ -1,21 +1,21 @@
---- #YAML:1.0
-name:               BerkeleyDB
-version:            0.50
-abstract:           Perl extension for Berkeley DB version 2, 3, 4 or 5
+---
+abstract: 'Perl extension for Berkeley DB version 2, 3, 4 or 5'
 author:
-    - Paul Marquess <pmqs@cpan.org>
-license:            perl
-distribution_type:  module
-configure_requires:
-    ExtUtils::MakeMaker:  0
+  - 'Paul Marquess <pmqs@cpan.org>'
 build_requires:
-    ExtUtils::MakeMaker:  0
-requires:  {}
-no_index:
-    directory:
-        - t
-        - inc
-generated_by:       ExtUtils::MakeMaker version 6.57_05
+  ExtUtils::MakeMaker: 0
+configure_requires:
+  ExtUtils::MakeMaker: 0
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921'
+license: perl
 meta-spec:
-    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
-    version:  1.4
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4
+name: BerkeleyDB
+no_index:
+  directory:
+    - t
+    - inc
+requires: {}
+version: 0.55
diff --git a/lang/perl/BerkeleyDB/README b/lang/perl/BerkeleyDB/README
index 26da9abd..61a53bc2 100644
--- a/lang/perl/BerkeleyDB/README
+++ b/lang/perl/BerkeleyDB/README
@@ -1,11 +1,11 @@
                                 BerkeleyDB
 
-                               Version 0.50
+                               Version 0.54
 
-                            10th December 2011
+                             9th November 2013
                               
 
-     Copyright (c) 1997-2011 Paul Marquess. All rights reserved. This
+     Copyright (c) 1997-2013 Paul Marquess. All rights reserved. This
       program is free software; you can redistribute it and/or modify
                   it under the same terms as Perl itself.
 
@@ -35,7 +35,7 @@ installed on your system:
       directory where you have untarred this module is NOT a network
       drive, e.g. NFS or AFS.
 
-    * Perl 5.00 or greater.
+    * Perl 5.6.0 or greater.
 
     * Berkeley DB Version 2.6.4 or greater
 
diff --git a/lang/perl/BerkeleyDB/constants.h b/lang/perl/BerkeleyDB/constants.h
index 6f55ad4d..0893f38b 100644
--- a/lang/perl/BerkeleyDB/constants.h
+++ b/lang/perl/BerkeleyDB/constants.h
@@ -831,13 +831,13 @@ constant_11 (pTHX_ const char *name, IV *iv_return) {
      DB2_AM_EXCL DB_APP_INIT DB_ARCH_ABS DB_ARCH_LOG DB_DEGREE_2 DB_DSYNC_DB
      DB_FILEOPEN DB_FIXEDLEN DB_GET_BOTH DB_GID_SIZE DB_INIT_CDB DB_INIT_LOG
      DB_INIT_REP DB_INIT_TXN DB_KEYEMPTY DB_KEYEXIST DB_KEYFIRST DB_LOCKDOWN
-     DB_LOCK_GET DB_LOCK_PUT DB_LOGMAGIC DB_LOG_DISK DB_LOG_PERM DB_LOG_ZERO
-     DB_MEM_LOCK DB_MULTIPLE DB_NEXT_DUP DB_NOSERVER DB_NOTFOUND DB_OK_BTREE
-     DB_OK_QUEUE DB_OK_RECNO DB_POSITION DB_PREV_DUP DB_QAMMAGIC DB_REGISTER
-     DB_RENUMBER DB_SEQ_WRAP DB_SNAPSHOT DB_STAT_ALL DB_ST_DUPOK DB_ST_RELEN
-     DB_TRUNCATE DB_TXNMAGIC DB_TXN_BULK DB_TXN_LOCK DB_TXN_REDO DB_TXN_SYNC
-     DB_TXN_UNDO DB_TXN_WAIT DB_WRNOSYNC DB_YIELDCPU LOGREC_DATA LOGREC_DBOP
-     LOGREC_Done LOGREC_TIME */
+     DB_LOCK_GET DB_LOCK_PUT DB_LOGMAGIC DB_LOG_BLOB DB_LOG_DISK DB_LOG_PERM
+     DB_LOG_ZERO DB_MEM_LOCK DB_MULTIPLE DB_NEXT_DUP DB_NOSERVER DB_NOTFOUND
+     DB_OK_BTREE DB_OK_QUEUE DB_OK_RECNO DB_POSITION DB_PREV_DUP DB_QAMMAGIC
+     DB_REGISTER DB_RENUMBER DB_SEQ_WRAP DB_SNAPSHOT DB_STAT_ALL DB_ST_DUPOK
+     DB_ST_RELEN DB_TRUNCATE DB_TXNMAGIC DB_TXN_BULK DB_TXN_LOCK DB_TXN_REDO
+     DB_TXN_SYNC DB_TXN_UNDO DB_TXN_WAIT DB_WRNOSYNC DB_YIELDCPU LOGREC_DATA
+     LOGREC_DBOP LOGREC_Done LOGREC_TIME */
   /* Offset 8 gives the best switch position.  */
   switch (name[8]) {
   case 'A':
@@ -1139,6 +1139,15 @@ constant_11 (pTHX_ const char *name, IV *iv_return) {
       return PERL_constant_NOTDEF;
 #endif
     }
+    if (memEQ(name, "DB_LOG_BLOB", 11)) {
+    /*                       ^         */
+#ifdef DB_LOG_BLOB
+      *iv_return = DB_LOG_BLOB;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
     if (memEQ(name, "DB_ST_RELEN", 11)) {
     /*                       ^         */
 #ifdef DB_ST_RELEN
@@ -1422,8 +1431,8 @@ constant_12 (pTHX_ const char *name, IV *iv_return) {
      DB_NORECURSE DB_OVERWRITE DB_PAGEYIELD DB_PAGE_LOCK DB_PERMANENT
      DB_POSITIONI DB_PRINTABLE DB_QAMOLDVER DB_RPCCLIENT DB_SET_RANGE
      DB_SET_RECNO DB_ST_DUPSET DB_ST_RECNUM DB_SWAPBYTES DB_TEMPORARY
-     DB_TXN_ABORT DB_TXN_APPLY DB_TXN_PRINT DB_WRITELOCK DB_WRITEOPEN
-     DB_XA_CREATE LOGREC_LOCKS LOGREC_PGDBT */
+     DB_TXN_ABORT DB_TXN_APPLY DB_TXN_PRINT DB_VERB_MVCC DB_WRITELOCK
+     DB_WRITEOPEN DB_XA_CREATE LOGREC_LOCKS LOGREC_PGDBT */
   /* Offset 3 gives the best switch position.  */
   switch (name[3]) {
   case 'A':
@@ -1933,6 +1942,17 @@ constant_12 (pTHX_ const char *name, IV *iv_return) {
 #endif
     }
     break;
+  case 'V':
+    if (memEQ(name, "DB_VERB_MVCC", 12)) {
+    /*                  ^               */
+#ifdef DB_VERB_MVCC
+      *iv_return = DB_VERB_MVCC;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    break;
   case 'W':
     if (memEQ(name, "DB_WRITELOCK", 12)) {
     /*                  ^               */
@@ -1977,14 +1997,14 @@ constant_13 (pTHX_ const char *name, IV *iv_return) {
      DB_ENV_THREAD DB_FREE_SPACE DB_HASHOLDVER DB_HEAPOLDVER DB_INCOMPLETE
      DB_INIT_MPOOL DB_INIT_MUTEX DB_LOCAL_SITE DB_LOCK_ABORT DB_LOCK_CHECK
      DB_LOCK_NORUN DB_LOCK_RIW_N DB_LOCK_TRADE DB_LOGVERSION DB_LOG_CHKPNT
-     DB_LOG_COMMIT DB_LOG_DIRECT DB_LOG_LOCKED DB_LOG_NOCOPY DB_LOG_RESEND
-     DB_MEM_LOCKER DB_MEM_THREAD DB_MPOOL_EDIT DB_MPOOL_FREE DB_MPOOL_LAST
-     DB_MUTEXDEBUG DB_MUTEXLOCKS DB_NEXT_NODUP DB_NOORDERCHK DB_PREV_NODUP
-     DB_PR_HEADERS DB_QAMVERSION DB_RDWRMASTER DB_REGISTERED DB_REP_CLIENT
-     DB_REP_CREATE DB_REP_IGNORE DB_REP_ISPERM DB_REP_MASTER DB_SEQUENTIAL
-     DB_SPARE_FLAG DB_STAT_ALLOC DB_STAT_CLEAR DB_ST_DUPSORT DB_SYSTEM_MEM
-     DB_TXNVERSION DB_TXN_FAMILY DB_TXN_NOSYNC DB_TXN_NOWAIT DB_VERIFY_BAD
-     DB_debug_FLAG DB_user_BEGIN LOGREC_PGDDBT LOGREC_PGLIST */
+     DB_LOG_COMMIT DB_LOG_DIRECT DB_LOG_LOCKED DB_LOG_NOCOPY DB_LOG_NOSYNC
+     DB_LOG_RESEND DB_MEM_LOCKER DB_MEM_THREAD DB_MPOOL_EDIT DB_MPOOL_FREE
+     DB_MPOOL_LAST DB_MUTEXDEBUG DB_MUTEXLOCKS DB_NEXT_NODUP DB_NOORDERCHK
+     DB_PREV_NODUP DB_PR_HEADERS DB_QAMVERSION DB_RDWRMASTER DB_REGISTERED
+     DB_REP_CLIENT DB_REP_CREATE DB_REP_IGNORE DB_REP_ISPERM DB_REP_MASTER
+     DB_SEQUENTIAL DB_SPARE_FLAG DB_STAT_ALLOC DB_STAT_CLEAR DB_ST_DUPSORT
+     DB_SYSTEM_MEM DB_TXNVERSION DB_TXN_FAMILY DB_TXN_NOSYNC DB_TXN_NOWAIT
+     DB_VERIFY_BAD DB_debug_FLAG DB_user_BEGIN LOGREC_PGDDBT LOGREC_PGLIST */
   /* Offset 5 gives the best switch position.  */
   switch (name[5]) {
   case 'A':
@@ -2221,6 +2241,15 @@ constant_13 (pTHX_ const char *name, IV *iv_return) {
       return PERL_constant_NOTDEF;
 #endif
     }
+    if (memEQ(name, "DB_LOG_NOSYNC", 13)) {
+    /*                    ^              */
+#ifdef DB_LOG_NOSYNC
+      *iv_return = DB_LOG_NOSYNC;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
     if (memEQ(name, "DB_LOG_RESEND", 13)) {
     /*                    ^              */
 #ifdef DB_LOG_RESEND
@@ -2627,75 +2656,61 @@ constant_14 (pTHX_ const char *name, IV *iv_return) {
   /* When generated this function returned values for the list of names given
      here.  However, subsequent manual editing may have added or removed some.
      DB2_AM_INTEXCL DB_ARCH_REMOVE DB_AUTO_COMMIT DB_BACKUP_SIZE DB_BTREEOLDVER
-     DB_CHKSUM_SHA1 DB_CURSOR_BULK DB_EID_INVALID DB_ENCRYPT_AES DB_ENV_APPINIT
-     DB_ENV_DBLOCAL DB_ENV_FAILCHK DB_ENV_LOCKING DB_ENV_LOGGING DB_ENV_NOFLUSH
-     DB_ENV_NOPANIC DB_ENV_PRIVATE DB_EVENT_PANIC DB_FILE_ID_LEN DB_HANDLE_LOCK
-     DB_HASHVERSION DB_HEAPVERSION DB_HEAP_RID_SZ DB_INTERNAL_DB DB_JOIN_NOSORT
-     DB_LOCKVERSION DB_LOCK_EXPIRE DB_LOCK_NOWAIT DB_LOCK_OLDEST DB_LOCK_RANDOM
-     DB_LOCK_RECORD DB_LOCK_REMOVE DB_LOCK_SWITCH DB_LOG_NO_DATA DB_MAX_RECORDS
-     DB_MPOOL_CLEAN DB_MPOOL_DIRTY DB_NOOVERWRITE DB_NOSERVER_ID DB_ODDFILESIZE
-     DB_OLD_VERSION DB_OPEN_CALLED DB_RECORDCOUNT DB_RECORD_LOCK DB_REGION_ANON
-     DB_REGION_INIT DB_REGION_NAME DB_RENAMEMAGIC DB_REPMGR_PEER DB_REP_BULKOVF
-     DB_REP_EGENCHG DB_REP_LOCKOUT DB_REP_NEWSITE DB_REP_NOTPERM DB_REP_UNAVAIL
-     DB_REVSPLITOFF DB_RUNRECOVERY DB_SEQ_WRAPPED DB_SET_TXN_NOW DB_SHALLOW_DUP
-     DB_ST_IS_RECNO DB_ST_TOPLEVEL DB_USE_ENVIRON DB_VERB_BACKUP DB_WRITECURSOR
-     DB_XIDDATASIZE LOGREC_POINTER */
-  /* Offset 13 gives the best switch position.  */
-  switch (name[13]) {
-  case '1':
-    if (memEQ(name, "DB_CHKSUM_SHA", 13)) {
-    /*                            1      */
-#ifdef DB_CHKSUM_SHA1
-      *iv_return = DB_CHKSUM_SHA1;
-      return PERL_constant_ISIV;
-#else
-      return PERL_constant_NOTDEF;
-#endif
-    }
-    break;
+     DB_CHKSUM_FAIL DB_CHKSUM_SHA1 DB_CURSOR_BULK DB_EID_INVALID DB_ENCRYPT_AES
+     DB_ENV_APPINIT DB_ENV_DBLOCAL DB_ENV_FAILCHK DB_ENV_LOCKING DB_ENV_LOGGING
+     DB_ENV_NOFLUSH DB_ENV_NOPANIC DB_ENV_PRIVATE DB_EVENT_PANIC DB_FILE_ID_LEN
+     DB_HANDLE_LOCK DB_HASHVERSION DB_HEAPVERSION DB_HEAP_RID_SZ DB_INTERNAL_DB
+     DB_JOIN_NOSORT DB_LOCKVERSION DB_LOCK_EXPIRE DB_LOCK_NOWAIT DB_LOCK_OLDEST
+     DB_LOCK_RANDOM DB_LOCK_RECORD DB_LOCK_REMOVE DB_LOCK_SWITCH DB_LOG_NO_DATA
+     DB_MAX_RECORDS DB_MPOOL_CLEAN DB_MPOOL_DIRTY DB_NOOVERWRITE DB_NOSERVER_ID
+     DB_ODDFILESIZE DB_OLD_VERSION DB_OPEN_CALLED DB_RECORDCOUNT DB_RECORD_LOCK
+     DB_REGION_ANON DB_REGION_INIT DB_REGION_NAME DB_RENAMEMAGIC DB_REPMGR_PEER
+     DB_REP_BULKOVF DB_REP_EGENCHG DB_REP_LOCKOUT DB_REP_NEWSITE DB_REP_NOTPERM
+     DB_REP_UNAVAIL DB_REVSPLITOFF DB_RUNRECOVERY DB_SEQ_WRAPPED DB_SET_TXN_NOW
+     DB_SHALLOW_DUP DB_STREAM_READ DB_ST_IS_RECNO DB_ST_TOPLEVEL DB_USE_ENVIRON
+     DB_VERB_BACKUP DB_WRITECURSOR DB_XIDDATASIZE LOGREC_LONGARG LOGREC_POINTER
+     */
+  /* Offset 10 gives the best switch position.  */
+  switch (name[10]) {
   case 'A':
-    if (memEQ(name, "DB_LOG_NO_DAT", 13)) {
-    /*                            A      */
-#ifdef DB_LOG_NO_DATA
-      *iv_return = DB_LOG_NO_DATA;
+    if (memEQ(name, "DB_EID_INVALID", 14)) {
+    /*                         ^          */
+#ifdef DB_EID_INVALID
+      *iv_return = DB_EID_INVALID;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'B':
-    if (memEQ(name, "DB_INTERNAL_D", 13)) {
-    /*                            B      */
-#ifdef DB_INTERNAL_DB
-      *iv_return = DB_INTERNAL_DB;
+    if (memEQ(name, "DB_ENV_NOPANIC", 14)) {
+    /*                         ^          */
+#ifdef DB_ENV_NOPANIC
+      *iv_return = DB_ENV_NOPANIC;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'C':
-    if (memEQ(name, "DB_ENV_NOPANI", 13)) {
-    /*                            C      */
-#ifdef DB_ENV_NOPANIC
-      *iv_return = DB_ENV_NOPANIC;
+    if (memEQ(name, "DB_EVENT_PANIC", 14)) {
+    /*                         ^          */
+#ifdef DB_EVENT_PANIC
+      *iv_return = DB_EVENT_PANIC;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_EVENT_PANI", 13)) {
-    /*                            C      */
-#ifdef DB_EVENT_PANIC
-      *iv_return = DB_EVENT_PANIC;
+    if (memEQ(name, "DB_REGION_ANON", 14)) {
+    /*                         ^          */
+#ifdef DB_REGION_ANON
+      *iv_return = DB_REGION_ANON;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_RENAMEMAGI", 13)) {
-    /*                            C      */
+    if (memEQ(name, "DB_RENAMEMAGIC", 14)) {
+    /*                         ^          */
 #ifdef DB_RENAMEMAGIC
       *iv_return = DB_RENAMEMAGIC;
       return PERL_constant_ISIV;
@@ -2704,18 +2719,20 @@ constant_14 (pTHX_ const char *name, IV *iv_return) {
 #endif
     }
     break;
-  case 'D':
-    if (memEQ(name, "DB_EID_INVALI", 13)) {
-    /*                            D      */
-#ifdef DB_EID_INVALID
-      *iv_return = DB_EID_INVALID;
+  case 'B':
+    if (memEQ(name, "DB_CURSOR_BULK", 14)) {
+    /*                         ^          */
+#ifdef DB_CURSOR_BULK
+      *iv_return = DB_CURSOR_BULK;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_LOCK_RECOR", 13)) {
-    /*                            D      */
+    break;
+  case 'C':
+    if (memEQ(name, "DB_LOCK_RECORD", 14)) {
+    /*                         ^          */
 #ifdef DB_LOCK_RECORD
       *iv_return = DB_LOCK_RECORD;
       return PERL_constant_ISIV;
@@ -2723,152 +2740,167 @@ constant_14 (pTHX_ const char *name, IV *iv_return) {
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_NOSERVER_I", 13)) {
-    /*                            D      */
-#ifdef DB_NOSERVER_ID
-      *iv_return = DB_NOSERVER_ID;
+    if (memEQ(name, "DB_VERB_BACKUP", 14)) {
+    /*                         ^          */
+#ifdef DB_VERB_BACKUP
+      *iv_return = DB_VERB_BACKUP;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_OPEN_CALLE", 13)) {
-    /*                            D      */
-#ifdef DB_OPEN_CALLED
-      *iv_return = DB_OPEN_CALLED;
+    break;
+  case 'D':
+    if (memEQ(name, "DB_BTREEOLDVER", 14)) {
+    /*                         ^          */
+#ifdef DB_BTREEOLDVER
+      *iv_return = DB_BTREEOLDVER;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_SEQ_WRAPPE", 13)) {
-    /*                            D      */
-#ifdef DB_SEQ_WRAPPED
-      *iv_return = DB_SEQ_WRAPPED;
+    if (memEQ(name, "DB_HEAP_RID_SZ", 14)) {
+    /*                         ^          */
+#ifdef DB_HEAP_RID_SZ
+      *iv_return = DB_HEAP_RID_SZ;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'E':
-    if (memEQ(name, "DB_ARCH_REMOV", 13)) {
-    /*                            E      */
-#ifdef DB_ARCH_REMOVE
-      *iv_return = DB_ARCH_REMOVE;
+    if (memEQ(name, "DB_LOCK_OLDEST", 14)) {
+    /*                         ^          */
+#ifdef DB_LOCK_OLDEST
+      *iv_return = DB_LOCK_OLDEST;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_BACKUP_SIZ", 13)) {
-    /*                            E      */
-#if (DB_VERSION_MAJOR > 5) || \
-    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \
-    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \
-     DB_VERSION_PATCH >= 5)
-      *iv_return = DB_BACKUP_SIZE;
+    if (memEQ(name, "DB_LOG_NO_DATA", 14)) {
+    /*                         ^          */
+#ifdef DB_LOG_NO_DATA
+      *iv_return = DB_LOG_NO_DATA;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_ENV_PRIVAT", 13)) {
-    /*                            E      */
-#ifdef DB_ENV_PRIVATE
-      *iv_return = DB_ENV_PRIVATE;
+    break;
+  case 'E':
+    if (memEQ(name, "DB2_AM_INTEXCL", 14)) {
+    /*                         ^          */
+#ifdef DB2_AM_INTEXCL
+      *iv_return = DB2_AM_INTEXCL;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_LOCK_EXPIR", 13)) {
-    /*                            E      */
-#ifdef DB_LOCK_EXPIRE
-      *iv_return = DB_LOCK_EXPIRE;
+    if (memEQ(name, "DB_ST_IS_RECNO", 14)) {
+    /*                         ^          */
+#ifdef DB_ST_IS_RECNO
+      *iv_return = DB_ST_IS_RECNO;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_LOCK_REMOV", 13)) {
-    /*                            E      */
-#ifdef DB_LOCK_REMOVE
-      *iv_return = DB_LOCK_REMOVE;
+    if (memEQ(name, "DB_ST_TOPLEVEL", 14)) {
+    /*                         ^          */
+#ifdef DB_ST_TOPLEVEL
+      *iv_return = DB_ST_TOPLEVEL;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_NOOVERWRIT", 13)) {
-    /*                            E      */
-#ifdef DB_NOOVERWRITE
-      *iv_return = DB_NOOVERWRITE;
+    break;
+  case 'F':
+    if (memEQ(name, "DB_CHKSUM_FAIL", 14)) {
+    /*                         ^          */
+#ifdef DB_CHKSUM_FAIL
+      *iv_return = DB_CHKSUM_FAIL;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_ODDFILESIZ", 13)) {
-    /*                            E      */
-#ifdef DB_ODDFILESIZE
-      *iv_return = DB_ODDFILESIZE;
+    break;
+  case 'G':
+    if (memEQ(name, "DB_ENV_LOGGING", 14)) {
+    /*                         ^          */
+#ifdef DB_ENV_LOGGING
+      *iv_return = DB_ENV_LOGGING;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REGION_NAM", 13)) {
-    /*                            E      */
-#ifdef DB_REGION_NAME
-      *iv_return = DB_REGION_NAME;
+    if (memEQ(name, "LOGREC_LONGARG", 14)) {
+    /*                         ^          */
+#if (DB_VERSION_MAJOR > 6) || \
+    (DB_VERSION_MAJOR == 6 && DB_VERSION_MINOR > 0) || \
+    (DB_VERSION_MAJOR == 6 && DB_VERSION_MINOR == 0 && \
+     DB_VERSION_PATCH >= 30)
+      *iv_return = LOGREC_LONGARG;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REP_NEWSIT", 13)) {
-    /*                            E      */
-#ifdef DB_REP_NEWSITE
-      *iv_return = DB_REP_NEWSITE;
+    break;
+  case 'I':
+    if (memEQ(name, "DB_ENV_APPINIT", 14)) {
+    /*                         ^          */
+#ifdef DB_ENV_APPINIT
+      *iv_return = DB_ENV_APPINIT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_XIDDATASIZ", 13)) {
-    /*                            E      */
-#ifdef DB_XIDDATASIZE
-      *iv_return = DB_XIDDATASIZE;
+    if (memEQ(name, "DB_LOCK_SWITCH", 14)) {
+    /*                         ^          */
+#ifdef DB_LOCK_SWITCH
+      *iv_return = DB_LOCK_SWITCH;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'F':
-    if (memEQ(name, "DB_REP_BULKOV", 13)) {
-    /*                            F      */
-#ifdef DB_REP_BULKOVF
-      *iv_return = DB_REP_BULKOVF;
+    if (memEQ(name, "DB_MPOOL_DIRTY", 14)) {
+    /*                         ^          */
+#ifdef DB_MPOOL_DIRTY
+      *iv_return = DB_MPOOL_DIRTY;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REVSPLITOF", 13)) {
-    /*                            F      */
-#ifdef DB_REVSPLITOFF
-      *iv_return = DB_REVSPLITOFF;
+    if (memEQ(name, "DB_REGION_INIT", 14)) {
+    /*                         ^          */
+#ifdef DB_REGION_INIT
+      *iv_return = DB_REGION_INIT;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    if (memEQ(name, "DB_USE_ENVIRON", 14)) {
+    /*                         ^          */
+#ifdef DB_USE_ENVIRON
+      *iv_return = DB_USE_ENVIRON;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'G':
-    if (memEQ(name, "DB_ENV_LOCKIN", 13)) {
-    /*                            G      */
+  case 'K':
+    if (memEQ(name, "DB_ENV_LOCKING", 14)) {
+    /*                         ^          */
 #ifdef DB_ENV_LOCKING
       *iv_return = DB_ENV_LOCKING;
       return PERL_constant_ISIV;
@@ -2876,28 +2908,37 @@ constant_14 (pTHX_ const char *name, IV *iv_return) {
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_ENV_LOGGIN", 13)) {
-    /*                            G      */
-#ifdef DB_ENV_LOGGING
-      *iv_return = DB_ENV_LOGGING;
+    if (memEQ(name, "DB_REP_BULKOVF", 14)) {
+    /*                         ^          */
+#ifdef DB_REP_BULKOVF
+      *iv_return = DB_REP_BULKOVF;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REP_EGENCH", 13)) {
-    /*                            G      */
-#ifdef DB_REP_EGENCHG
-      *iv_return = DB_REP_EGENCHG;
+    if (memEQ(name, "DB_REP_LOCKOUT", 14)) {
+    /*                         ^          */
+#ifdef DB_REP_LOCKOUT
+      *iv_return = DB_REP_LOCKOUT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'H':
-    if (memEQ(name, "DB_ENV_NOFLUS", 13)) {
-    /*                            H      */
+  case 'L':
+    if (memEQ(name, "DB_ENV_FAILCHK", 14)) {
+    /*                         ^          */
+#ifdef DB_ENV_FAILCHK
+      *iv_return = DB_ENV_FAILCHK;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    if (memEQ(name, "DB_ENV_NOFLUSH", 14)) {
+    /*                         ^          */
 #ifdef DB_ENV_NOFLUSH
       *iv_return = DB_ENV_NOFLUSH;
       return PERL_constant_ISIV;
@@ -2905,46 +2946,44 @@ constant_14 (pTHX_ const char *name, IV *iv_return) {
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_LOCK_SWITC", 13)) {
-    /*                            H      */
-#ifdef DB_LOCK_SWITCH
-      *iv_return = DB_LOCK_SWITCH;
+    if (memEQ(name, "DB_HANDLE_LOCK", 14)) {
+    /*                         ^          */
+#ifdef DB_HANDLE_LOCK
+      *iv_return = DB_HANDLE_LOCK;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'K':
-    if (memEQ(name, "DB_CURSOR_BUL", 13)) {
-    /*                            K      */
-#ifdef DB_CURSOR_BULK
-      *iv_return = DB_CURSOR_BULK;
+    if (memEQ(name, "DB_INTERNAL_DB", 14)) {
+    /*                         ^          */
+#ifdef DB_INTERNAL_DB
+      *iv_return = DB_INTERNAL_DB;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_ENV_FAILCH", 13)) {
-    /*                            K      */
-#ifdef DB_ENV_FAILCHK
-      *iv_return = DB_ENV_FAILCHK;
+    if (memEQ(name, "DB_MPOOL_CLEAN", 14)) {
+    /*                         ^          */
+#ifdef DB_MPOOL_CLEAN
+      *iv_return = DB_MPOOL_CLEAN;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_HANDLE_LOC", 13)) {
-    /*                            K      */
-#ifdef DB_HANDLE_LOCK
-      *iv_return = DB_HANDLE_LOCK;
+    if (memEQ(name, "DB_OPEN_CALLED", 14)) {
+    /*                         ^          */
+#ifdef DB_OPEN_CALLED
+      *iv_return = DB_OPEN_CALLED;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_RECORD_LOC", 13)) {
-    /*                            K      */
+    if (memEQ(name, "DB_RECORD_LOCK", 14)) {
+    /*                         ^          */
 #ifdef DB_RECORD_LOCK
       *iv_return = DB_RECORD_LOCK;
       return PERL_constant_ISIV;
@@ -2953,298 +2992,310 @@ constant_14 (pTHX_ const char *name, IV *iv_return) {
 #endif
     }
     break;
-  case 'L':
-    if (memEQ(name, "DB2_AM_INTEXC", 13)) {
-    /*                            L      */
-#ifdef DB2_AM_INTEXCL
-      *iv_return = DB2_AM_INTEXCL;
+  case 'M':
+    if (memEQ(name, "DB_ARCH_REMOVE", 14)) {
+    /*                         ^          */
+#ifdef DB_ARCH_REMOVE
+      *iv_return = DB_ARCH_REMOVE;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_ENV_DBLOCA", 13)) {
-    /*                            L      */
-#ifdef DB_ENV_DBLOCAL
-      *iv_return = DB_ENV_DBLOCAL;
+    if (memEQ(name, "DB_AUTO_COMMIT", 14)) {
+    /*                         ^          */
+#ifdef DB_AUTO_COMMIT
+      *iv_return = DB_AUTO_COMMIT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REP_UNAVAI", 13)) {
-    /*                            L      */
-#ifdef DB_REP_UNAVAIL
-      *iv_return = DB_REP_UNAVAIL;
+    if (memEQ(name, "DB_LOCK_REMOVE", 14)) {
+    /*                         ^          */
+#ifdef DB_LOCK_REMOVE
+      *iv_return = DB_LOCK_REMOVE;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_ST_TOPLEVE", 13)) {
-    /*                            L      */
-#ifdef DB_ST_TOPLEVEL
-      *iv_return = DB_ST_TOPLEVEL;
+    break;
+  case 'N':
+    if (memEQ(name, "DB_LOCK_RANDOM", 14)) {
+    /*                         ^          */
+#ifdef DB_LOCK_RANDOM
+      *iv_return = DB_LOCK_RANDOM;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'M':
-    if (memEQ(name, "DB_LOCK_RANDO", 13)) {
-    /*                            M      */
-#ifdef DB_LOCK_RANDOM
-      *iv_return = DB_LOCK_RANDOM;
+    if (memEQ(name, "DB_REGION_NAME", 14)) {
+    /*                         ^          */
+#ifdef DB_REGION_NAME
+      *iv_return = DB_REGION_NAME;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REP_NOTPER", 13)) {
-    /*                            M      */
-#ifdef DB_REP_NOTPERM
-      *iv_return = DB_REP_NOTPERM;
+    if (memEQ(name, "DB_REP_EGENCHG", 14)) {
+    /*                         ^          */
+#ifdef DB_REP_EGENCHG
+      *iv_return = DB_REP_EGENCHG;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'N':
-    if (memEQ(name, "DB_FILE_ID_LE", 13)) {
-    /*                            N      */
-#ifdef DB_FILE_ID_LEN
-      *iv_return = DB_FILE_ID_LEN;
+    if (memEQ(name, "LOGREC_POINTER", 14)) {
+    /*                         ^          */
+#if (DB_VERSION_MAJOR > 5) || \
+    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 0) || \
+    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 0 && \
+     DB_VERSION_PATCH >= 6)
+      *iv_return = LOGREC_POINTER;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_HASHVERSIO", 13)) {
-    /*                            N      */
-#ifdef DB_HASHVERSION
-      *iv_return = DB_HASHVERSION;
+    break;
+  case 'O':
+    if (memEQ(name, "DB_ENV_DBLOCAL", 14)) {
+    /*                         ^          */
+#ifdef DB_ENV_DBLOCAL
+      *iv_return = DB_ENV_DBLOCAL;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_HEAPVERSIO", 13)) {
-    /*                            N      */
-#ifdef DB_HEAPVERSION
-      *iv_return = DB_HEAPVERSION;
+    if (memEQ(name, "DB_MAX_RECORDS", 14)) {
+    /*                         ^          */
+#ifdef DB_MAX_RECORDS
+      *iv_return = DB_MAX_RECORDS;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_LOCKVERSIO", 13)) {
-    /*                            N      */
-#ifdef DB_LOCKVERSION
-      *iv_return = DB_LOCKVERSION;
+    if (memEQ(name, "DB_RECORDCOUNT", 14)) {
+    /*                         ^          */
+#ifdef DB_RECORDCOUNT
+      *iv_return = DB_RECORDCOUNT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_MPOOL_CLEA", 13)) {
-    /*                            N      */
-#ifdef DB_MPOOL_CLEAN
-      *iv_return = DB_MPOOL_CLEAN;
+    break;
+  case 'P':
+    if (memEQ(name, "DB_LOCK_EXPIRE", 14)) {
+    /*                         ^          */
+#ifdef DB_LOCK_EXPIRE
+      *iv_return = DB_LOCK_EXPIRE;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_OLD_VERSIO", 13)) {
-    /*                            N      */
-#ifdef DB_OLD_VERSION
-      *iv_return = DB_OLD_VERSION;
+    if (memEQ(name, "DB_REPMGR_PEER", 14)) {
+    /*                         ^          */
+#ifdef DB_REPMGR_PEER
+      *iv_return = DB_REPMGR_PEER;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REGION_ANO", 13)) {
-    /*                            N      */
-#ifdef DB_REGION_ANON
-      *iv_return = DB_REGION_ANON;
+    if (memEQ(name, "DB_REP_NOTPERM", 14)) {
+    /*                         ^          */
+#ifdef DB_REP_NOTPERM
+      *iv_return = DB_REP_NOTPERM;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_USE_ENVIRO", 13)) {
-    /*                            N      */
-#ifdef DB_USE_ENVIRON
-      *iv_return = DB_USE_ENVIRON;
+    if (memEQ(name, "DB_SEQ_WRAPPED", 14)) {
+    /*                         ^          */
+#ifdef DB_SEQ_WRAPPED
+      *iv_return = DB_SEQ_WRAPPED;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'O':
-    if (memEQ(name, "DB_ST_IS_RECN", 13)) {
-    /*                            O      */
-#ifdef DB_ST_IS_RECNO
-      *iv_return = DB_ST_IS_RECNO;
+  case 'R':
+    if (memEQ(name, "DB_NOOVERWRITE", 14)) {
+    /*                         ^          */
+#ifdef DB_NOOVERWRITE
+      *iv_return = DB_NOOVERWRITE;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'P':
-    if (memEQ(name, "DB_SHALLOW_DU", 13)) {
-    /*                            P      */
-#ifdef DB_SHALLOW_DUP
-      *iv_return = DB_SHALLOW_DUP;
+    if (memEQ(name, "DB_NOSERVER_ID", 14)) {
+    /*                         ^          */
+#ifdef DB_NOSERVER_ID
+      *iv_return = DB_NOSERVER_ID;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_VERB_BACKU", 13)) {
-    /*                            P      */
-#ifdef DB_VERB_BACKUP
-      *iv_return = DB_VERB_BACKUP;
+    if (memEQ(name, "DB_STREAM_READ", 14)) {
+    /*                         ^          */
+#ifdef DB_STREAM_READ
+      *iv_return = DB_STREAM_READ;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    if (memEQ(name, "DB_WRITECURSOR", 14)) {
+    /*                         ^          */
+#ifdef DB_WRITECURSOR
+      *iv_return = DB_WRITECURSOR;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'R':
-    if (memEQ(name, "DB_BTREEOLDVE", 13)) {
-    /*                            R      */
-#ifdef DB_BTREEOLDVER
-      *iv_return = DB_BTREEOLDVER;
+  case 'S':
+    if (memEQ(name, "DB_BACKUP_SIZE", 14)) {
+    /*                         ^          */
+#if (DB_VERSION_MAJOR > 5) || \
+    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \
+    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \
+     DB_VERSION_PATCH >= 15)
+      *iv_return = DB_BACKUP_SIZE;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REPMGR_PEE", 13)) {
-    /*                            R      */
-#ifdef DB_REPMGR_PEER
-      *iv_return = DB_REPMGR_PEER;
+    if (memEQ(name, "DB_CHKSUM_SHA1", 14)) {
+    /*                         ^          */
+#ifdef DB_CHKSUM_SHA1
+      *iv_return = DB_CHKSUM_SHA1;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_WRITECURSO", 13)) {
-    /*                            R      */
-#ifdef DB_WRITECURSOR
-      *iv_return = DB_WRITECURSOR;
+    if (memEQ(name, "DB_HASHVERSION", 14)) {
+    /*                         ^          */
+#ifdef DB_HASHVERSION
+      *iv_return = DB_HASHVERSION;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "LOGREC_POINTE", 13)) {
-    /*                            R      */
-#if (DB_VERSION_MAJOR > 5) || \
-    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 0) || \
-    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 0 && \
-     DB_VERSION_PATCH >= 6)
-      *iv_return = LOGREC_POINTER;
+    if (memEQ(name, "DB_HEAPVERSION", 14)) {
+    /*                         ^          */
+#ifdef DB_HEAPVERSION
+      *iv_return = DB_HEAPVERSION;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'S':
-    if (memEQ(name, "DB_ENCRYPT_AE", 13)) {
-    /*                            S      */
-#ifdef DB_ENCRYPT_AES
-      *iv_return = DB_ENCRYPT_AES;
+    if (memEQ(name, "DB_JOIN_NOSORT", 14)) {
+    /*                         ^          */
+#ifdef DB_JOIN_NOSORT
+      *iv_return = DB_JOIN_NOSORT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_MAX_RECORD", 13)) {
-    /*                            S      */
-#ifdef DB_MAX_RECORDS
-      *iv_return = DB_MAX_RECORDS;
+    if (memEQ(name, "DB_LOCKVERSION", 14)) {
+    /*                         ^          */
+#ifdef DB_LOCKVERSION
+      *iv_return = DB_LOCKVERSION;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'T':
-    if (memEQ(name, "DB_AUTO_COMMI", 13)) {
-    /*                            T      */
-#ifdef DB_AUTO_COMMIT
-      *iv_return = DB_AUTO_COMMIT;
+    if (memEQ(name, "DB_ODDFILESIZE", 14)) {
+    /*                         ^          */
+#ifdef DB_ODDFILESIZE
+      *iv_return = DB_ODDFILESIZE;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_ENV_APPINI", 13)) {
-    /*                            T      */
-#ifdef DB_ENV_APPINIT
-      *iv_return = DB_ENV_APPINIT;
+    if (memEQ(name, "DB_OLD_VERSION", 14)) {
+    /*                         ^          */
+#ifdef DB_OLD_VERSION
+      *iv_return = DB_OLD_VERSION;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_JOIN_NOSOR", 13)) {
-    /*                            T      */
-#ifdef DB_JOIN_NOSORT
-      *iv_return = DB_JOIN_NOSORT;
+    if (memEQ(name, "DB_REP_NEWSITE", 14)) {
+    /*                         ^          */
+#ifdef DB_REP_NEWSITE
+      *iv_return = DB_REP_NEWSITE;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_LOCK_NOWAI", 13)) {
-    /*                            T      */
-#ifdef DB_LOCK_NOWAIT
-      *iv_return = DB_LOCK_NOWAIT;
+    if (memEQ(name, "DB_XIDDATASIZE", 14)) {
+    /*                         ^          */
+#ifdef DB_XIDDATASIZE
+      *iv_return = DB_XIDDATASIZE;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_LOCK_OLDES", 13)) {
-    /*                            T      */
-#ifdef DB_LOCK_OLDEST
-      *iv_return = DB_LOCK_OLDEST;
+    break;
+  case 'T':
+    if (memEQ(name, "DB_REVSPLITOFF", 14)) {
+    /*                         ^          */
+#ifdef DB_REVSPLITOFF
+      *iv_return = DB_REVSPLITOFF;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_RECORDCOUN", 13)) {
-    /*                            T      */
-#ifdef DB_RECORDCOUNT
-      *iv_return = DB_RECORDCOUNT;
+    break;
+  case 'V':
+    if (memEQ(name, "DB_ENV_PRIVATE", 14)) {
+    /*                         ^          */
+#ifdef DB_ENV_PRIVATE
+      *iv_return = DB_ENV_PRIVATE;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REGION_INI", 13)) {
-    /*                            T      */
-#ifdef DB_REGION_INIT
-      *iv_return = DB_REGION_INIT;
+    if (memEQ(name, "DB_REP_UNAVAIL", 14)) {
+    /*                         ^          */
+#ifdef DB_REP_UNAVAIL
+      *iv_return = DB_REP_UNAVAIL;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REP_LOCKOU", 13)) {
-    /*                            T      */
-#ifdef DB_REP_LOCKOUT
-      *iv_return = DB_REP_LOCKOUT;
+    if (memEQ(name, "DB_RUNRECOVERY", 14)) {
+    /*                         ^          */
+#ifdef DB_RUNRECOVERY
+      *iv_return = DB_RUNRECOVERY;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -3252,41 +3303,48 @@ constant_14 (pTHX_ const char *name, IV *iv_return) {
     }
     break;
   case 'W':
-    if (memEQ(name, "DB_SET_TXN_NO", 13)) {
-    /*                            W      */
-#ifdef DB_SET_TXN_NOW
-      *iv_return = DB_SET_TXN_NOW;
+    if (memEQ(name, "DB_LOCK_NOWAIT", 14)) {
+    /*                         ^          */
+#ifdef DB_LOCK_NOWAIT
+      *iv_return = DB_LOCK_NOWAIT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'Y':
-    if (memEQ(name, "DB_MPOOL_DIRT", 13)) {
-    /*                            Y      */
-#ifdef DB_MPOOL_DIRTY
-      *iv_return = DB_MPOOL_DIRTY;
+  case '_':
+    if (memEQ(name, "DB_ENCRYPT_AES", 14)) {
+    /*                         ^          */
+#ifdef DB_ENCRYPT_AES
+      *iv_return = DB_ENCRYPT_AES;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_RUNRECOVER", 13)) {
-    /*                            Y      */
-#ifdef DB_RUNRECOVERY
-      *iv_return = DB_RUNRECOVERY;
+    if (memEQ(name, "DB_FILE_ID_LEN", 14)) {
+    /*                         ^          */
+#ifdef DB_FILE_ID_LEN
+      *iv_return = DB_FILE_ID_LEN;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'Z':
-    if (memEQ(name, "DB_HEAP_RID_S", 13)) {
-    /*                            Z      */
-#ifdef DB_HEAP_RID_SZ
-      *iv_return = DB_HEAP_RID_SZ;
+    if (memEQ(name, "DB_SET_TXN_NOW", 14)) {
+    /*                         ^          */
+#ifdef DB_SET_TXN_NOW
+      *iv_return = DB_SET_TXN_NOW;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    if (memEQ(name, "DB_SHALLOW_DUP", 14)) {
+    /*                         ^          */
+#ifdef DB_SHALLOW_DUP
+      *iv_return = DB_SHALLOW_DUP;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -3303,19 +3361,19 @@ constant_15 (pTHX_ const char *name, IV *iv_return) {
      here.  However, subsequent manual editing may have added or removed some.
      DB_APPLY_LOGREG DB_ASSOC_CREATE DB_BACKUP_CLEAN DB_BACKUP_FILES
      DB_BTREEVERSION DB_BUFFER_SMALL DB_CKP_INTERNAL DB_CONSUME_WAIT
-     DB_ENV_DSYNC_DB DB_ENV_LOCKDOWN DB_ENV_YIELDCPU DB_GET_BOTH_LTE
-     DB_IGNORE_LEASE DB_LOCK_DEFAULT DB_LOCK_INHERIT DB_LOCK_NOTHELD
-     DB_LOCK_PUT_ALL DB_LOCK_PUT_OBJ DB_LOCK_TIMEOUT DB_LOCK_UPGRADE
-     DB_LOG_INMEMORY DB_LOG_WRNOSYNC DB_MPOOL_CREATE DB_MPOOL_EXTENT
-     DB_MPOOL_NOFILE DB_MPOOL_NOLOCK DB_MPOOL_UNLINK DB_MULTIPLE_KEY
-     DB_MULTIVERSION DB_MUTEX_LOCKED DB_MUTEX_SHARED DB_MUTEX_THREAD
-     DB_OPFLAGS_MASK DB_ORDERCHKONLY DB_PRIORITY_LOW DB_REGION_MAGIC
-     DB_REP_ANYWHERE DB_REP_ELECTION DB_REP_LOGREADY DB_REP_LOGSONLY
-     DB_REP_NOBUFFER DB_REP_OUTDATED DB_REP_PAGEDONE DB_STAT_NOERROR
-     DB_STAT_SUMMARY DB_ST_OVFL_LEAF DB_SURPRISE_KID DB_TEST_POSTLOG
-     DB_TEST_PREOPEN DB_TEST_RECYCLE DB_TXN_LOCK_2PL DB_TXN_LOG_MASK
-     DB_TXN_LOG_REDO DB_TXN_LOG_UNDO DB_TXN_SNAPSHOT DB_VERB_FILEOPS
-     DB_VERIFY_FATAL */
+     DB_ENV_DSYNC_DB DB_ENV_LOCKDOWN DB_ENV_YIELDCPU DB_EXIT_FAILCHK
+     DB_GET_BOTH_LTE DB_IGNORE_LEASE DB_LOCK_DEFAULT DB_LOCK_INHERIT
+     DB_LOCK_NOTHELD DB_LOCK_PUT_ALL DB_LOCK_PUT_OBJ DB_LOCK_TIMEOUT
+     DB_LOCK_UPGRADE DB_LOG_INMEMORY DB_LOG_WRNOSYNC DB_MPOOL_CREATE
+     DB_MPOOL_EXTENT DB_MPOOL_NOFILE DB_MPOOL_NOLOCK DB_MPOOL_UNLINK
+     DB_MULTIPLE_KEY DB_MULTIVERSION DB_MUTEX_LOCKED DB_MUTEX_SHARED
+     DB_MUTEX_THREAD DB_OPFLAGS_MASK DB_ORDERCHKONLY DB_PRIORITY_LOW
+     DB_REGION_MAGIC DB_REP_ANYWHERE DB_REP_ELECTION DB_REP_LOGREADY
+     DB_REP_LOGSONLY DB_REP_NOBUFFER DB_REP_OUTDATED DB_REP_PAGEDONE
+     DB_STAT_NOERROR DB_STAT_SUMMARY DB_STREAM_WRITE DB_ST_OVFL_LEAF
+     DB_SURPRISE_KID DB_TEST_POSTLOG DB_TEST_PREOPEN DB_TEST_RECYCLE
+     DB_TXN_LOCK_2PL DB_TXN_LOG_MASK DB_TXN_LOG_REDO DB_TXN_LOG_UNDO
+     DB_TXN_SNAPSHOT DB_VERB_FILEOPS DB_VERIFY_FATAL */
   /* Offset 10 gives the best switch position.  */
   switch (name[10]) {
   case 'C':
@@ -3504,6 +3562,17 @@ constant_15 (pTHX_ const char *name, IV *iv_return) {
 #endif
     }
     break;
+  case 'I':
+    if (memEQ(name, "DB_EXIT_FAILCHK", 15)) {
+    /*                         ^           */
+#ifdef DB_EXIT_FAILCHK
+      *iv_return = DB_EXIT_FAILCHK;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    break;
   case 'K':
     if (memEQ(name, "DB_ENV_LOCKDOWN", 15)) {
     /*                         ^           */
@@ -3804,6 +3873,15 @@ constant_15 (pTHX_ const char *name, IV *iv_return) {
       return PERL_constant_NOTDEF;
 #endif
     }
+    if (memEQ(name, "DB_STREAM_WRITE", 15)) {
+    /*                         ^           */
+#ifdef DB_STREAM_WRITE
+      *iv_return = DB_STREAM_WRITE;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
     break;
   case 'X':
     if (memEQ(name, "DB_MPOOL_EXTENT", 15)) {
@@ -3903,13 +3981,14 @@ constant_16 (pTHX_ const char *name, IV *iv_return) {
      DB_LOCK_NOTEXIST DB_LOCK_PUT_READ DB_LOCK_YOUNGEST DB_LOGC_BUF_SIZE
      DB_LOG_IN_MEMORY DB_MPOOL_DISCARD DB_MPOOL_PRIVATE DB_NOSERVER_HOME
      DB_NO_CHECKPOINT DB_OVERWRITE_DUP DB_PAGE_NOTFOUND DB_PRIORITY_HIGH
-     DB_RECOVER_FATAL DB_REPFLAGS_MASK DB_REPMGR_ISPEER DB_REP_CONF_BULK
-     DB_REP_DUPMASTER DB_REP_NEWMASTER DB_REP_PERMANENT DB_REP_REREQUEST
-     DB_SA_UNKNOWNKEY DB_SECONDARY_BAD DB_SEQ_RANGE_SET DB_TEST_POSTOPEN
-     DB_TEST_POSTSYNC DB_TXN_LOCK_MASK DB_TXN_OPENFILES DB_VERB_CHKPOINT
-     DB_VERB_DEADLOCK DB_VERB_RECOVERY DB_VERB_REGISTER DB_VERB_REP_MISC
-     DB_VERB_REP_MSGS DB_VERB_REP_SYNC DB_VERB_REP_TEST DB_VERB_WAITSFOR
-     DB_VERSION_MAJOR DB_VERSION_MINOR DB_VERSION_PATCH DB_VRFY_FLAGMASK */
+     DB_RECOVER_FATAL DB_REPFLAGS_MASK DB_REPMGR_ISPEER DB_REPMGR_ISVIEW
+     DB_REP_CONF_BULK DB_REP_DUPMASTER DB_REP_NEWMASTER DB_REP_PERMANENT
+     DB_REP_REREQUEST DB_SA_UNKNOWNKEY DB_SECONDARY_BAD DB_SEQ_RANGE_SET
+     DB_TEST_POSTOPEN DB_TEST_POSTSYNC DB_TXN_LOCK_MASK DB_TXN_OPENFILES
+     DB_VERB_CHKPOINT DB_VERB_DEADLOCK DB_VERB_RECOVERY DB_VERB_REGISTER
+     DB_VERB_REP_MISC DB_VERB_REP_MSGS DB_VERB_REP_SYNC DB_VERB_REP_TEST
+     DB_VERB_WAITSFOR DB_VERSION_MAJOR DB_VERSION_MINOR DB_VERSION_PATCH
+     DB_VRFY_FLAGMASK */
   /* Offset 10 gives the best switch position.  */
   switch (name[10]) {
   case 'A':
@@ -4078,6 +4157,15 @@ constant_16 (pTHX_ const char *name, IV *iv_return) {
       return PERL_constant_NOTDEF;
 #endif
     }
+    if (memEQ(name, "DB_REPMGR_ISVIEW", 16)) {
+    /*                         ^            */
+#ifdef DB_REPMGR_ISVIEW
+      *iv_return = DB_REPMGR_ISVIEW;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
     if (memEQ(name, "DB_VERB_WAITSFOR", 16)) {
     /*                         ^            */
 #ifdef DB_VERB_WAITSFOR
@@ -5361,73 +5449,79 @@ constant_19 (pTHX_ const char *name, IV *iv_return) {
      here.  However, subsequent manual editing may have added or removed some.
      DB_BOOTSTRAP_HELPER DB_CURSOR_TRANSIENT DB_DATABASE_LOCKING
      DB_ENV_LOG_INMEMORY DB_ENV_MULTIVERSION DB_ENV_REP_LOGSONLY
-     DB_ENV_TXN_SNAPSHOT DB_EVENT_REP_CLIENT DB_EVENT_REP_MASTER
-     DB_FOREIGN_CONFLICT DB_LOCK_FREE_LOCKER DB_LOCK_GET_TIMEOUT
-     DB_LOCK_SET_TIMEOUT DB_MUTEX_SELF_BLOCK DB_PRIORITY_DEFAULT
-     DB_READ_UNCOMMITTED DB_REPMGR_ACKS_NONE DB_REPMGR_CONNECTED
-     DB_REP_HOLDELECTION DB_REP_JOIN_FAILURE DB_SEQUENCE_VERSION
-     DB_SET_LOCK_TIMEOUT DB_STAT_LOCK_PARAMS DB_TEST_POSTDESTROY
-     DB_TEST_POSTLOGMETA DB_TEST_SUBDB_LOCKS DB_TXN_FORWARD_ROLL
-     DB_TXN_LOG_UNDOREDO DB_TXN_WRITE_NOSYNC DB_UPDATE_SECONDARY
-     DB_USERCOPY_GETDATA DB_USERCOPY_SETDATA DB_USE_ENVIRON_ROOT
-     DB_VERB_FILEOPS_ALL DB_VERB_REPLICATION DB_VERB_REPMGR_MISC
-     DB_VERIFY_PARTITION DB_VERSION_MISMATCH */
-  /* Offset 14 gives the best switch position.  */
-  switch (name[14]) {
+     DB_ENV_TXN_SNAPSHOT DB_EVENT_MUTEX_DIED DB_EVENT_REP_CLIENT
+     DB_EVENT_REP_MASTER DB_EXIT_FILE_EXISTS DB_FOREIGN_CONFLICT
+     DB_INTERNAL_BLOB_DB DB_LOCK_FREE_LOCKER DB_LOCK_GET_TIMEOUT
+     DB_LOCK_SET_TIMEOUT DB_MUTEX_OWNER_DEAD DB_MUTEX_SELF_BLOCK
+     DB_PRIORITY_DEFAULT DB_READ_UNCOMMITTED DB_REPMGR_ACKS_NONE
+     DB_REPMGR_CONNECTED DB_REP_HOLDELECTION DB_REP_JOIN_FAILURE
+     DB_SEQUENCE_VERSION DB_SET_LOCK_TIMEOUT DB_STAT_LOCK_PARAMS
+     DB_TEST_POSTDESTROY DB_TEST_POSTLOGMETA DB_TEST_SUBDB_LOCKS
+     DB_TXN_FORWARD_ROLL DB_TXN_LOG_UNDOREDO DB_TXN_WRITE_NOSYNC
+     DB_UPDATE_SECONDARY DB_USERCOPY_GETDATA DB_USERCOPY_SETDATA
+     DB_USE_ENVIRON_ROOT DB_VERB_FILEOPS_ALL DB_VERB_REPLICATION
+     DB_VERB_REPMGR_MISC DB_VERIFY_PARTITION DB_VERSION_MISMATCH */
+  /* Offset 12 gives the best switch position.  */
+  switch (name[12]) {
   case 'A':
-    if (memEQ(name, "DB_EVENT_REP_MASTER", 19)) {
-    /*                             ^           */
-#ifdef DB_EVENT_REP_MASTER
-      *iv_return = DB_EVENT_REP_MASTER;
+    if (memEQ(name, "DB_CURSOR_TRANSIENT", 19)) {
+    /*                           ^             */
+#ifdef DB_CURSOR_TRANSIENT
+      *iv_return = DB_CURSOR_TRANSIENT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_STAT_LOCK_PARAMS", 19)) {
-    /*                             ^           */
-#ifdef DB_STAT_LOCK_PARAMS
-      *iv_return = DB_STAT_LOCK_PARAMS;
+    break;
+  case 'B':
+    if (memEQ(name, "DB_INTERNAL_BLOB_DB", 19)) {
+    /*                           ^             */
+#ifdef DB_INTERNAL_BLOB_DB
+      *iv_return = DB_INTERNAL_BLOB_DB;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_VERB_REPLICATION", 19)) {
-    /*                             ^           */
-#ifdef DB_VERB_REPLICATION
-      *iv_return = DB_VERB_REPLICATION;
+    if (memEQ(name, "DB_TEST_SUBDB_LOCKS", 19)) {
+    /*                           ^             */
+#ifdef DB_TEST_SUBDB_LOCKS
+      *iv_return = DB_TEST_SUBDB_LOCKS;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'B':
-    if (memEQ(name, "DB_MUTEX_SELF_BLOCK", 19)) {
-    /*                             ^           */
-#ifdef DB_MUTEX_SELF_BLOCK
-      *iv_return = DB_MUTEX_SELF_BLOCK;
+  case 'C':
+    if (memEQ(name, "DB_UPDATE_SECONDARY", 19)) {
+    /*                           ^             */
+#ifdef DB_UPDATE_SECONDARY
+      *iv_return = DB_UPDATE_SECONDARY;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'C':
-    if (memEQ(name, "DB_DATABASE_LOCKING", 19)) {
-    /*                             ^           */
-#ifdef DB_DATABASE_LOCKING
-      *iv_return = DB_DATABASE_LOCKING;
+  case 'D':
+    if (memEQ(name, "DB_PRIORITY_DEFAULT", 19)) {
+    /*                           ^             */
+#if (DB_VERSION_MAJOR > 4) || \
+    (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1) || \
+    (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && \
+     DB_VERSION_PATCH >= 24)
+      *iv_return = DB_PRIORITY_DEFAULT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REP_HOLDELECTION", 19)) {
-    /*                             ^           */
-#ifdef DB_REP_HOLDELECTION
-      *iv_return = DB_REP_HOLDELECTION;
+    if (memEQ(name, "DB_TEST_POSTDESTROY", 19)) {
+    /*                           ^             */
+#ifdef DB_TEST_POSTDESTROY
+      *iv_return = DB_TEST_POSTDESTROY;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -5435,62 +5529,59 @@ constant_19 (pTHX_ const char *name, IV *iv_return) {
     }
     break;
   case 'E':
-    if (memEQ(name, "DB_BOOTSTRAP_HELPER", 19)) {
-    /*                             ^           */
-#ifdef DB_BOOTSTRAP_HELPER
-      *iv_return = DB_BOOTSTRAP_HELPER;
+    if (memEQ(name, "DB_EVENT_MUTEX_DIED", 19)) {
+    /*                           ^             */
+#ifdef DB_EVENT_MUTEX_DIED
+      *iv_return = DB_EVENT_MUTEX_DIED;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_ENV_LOG_INMEMORY", 19)) {
-    /*                             ^           */
-#ifdef DB_ENV_LOG_INMEMORY
-      *iv_return = DB_ENV_LOG_INMEMORY;
+    if (memEQ(name, "DB_MUTEX_OWNER_DEAD", 19)) {
+    /*                           ^             */
+#ifdef DB_MUTEX_OWNER_DEAD
+      *iv_return = DB_MUTEX_OWNER_DEAD;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REPMGR_CONNECTED", 19)) {
-    /*                             ^           */
-#ifdef DB_REPMGR_CONNECTED
-      *iv_return = DB_REPMGR_CONNECTED;
+    break;
+  case 'F':
+    if (memEQ(name, "DB_MUTEX_SELF_BLOCK", 19)) {
+    /*                           ^             */
+#ifdef DB_MUTEX_SELF_BLOCK
+      *iv_return = DB_MUTEX_SELF_BLOCK;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'F':
-    if (memEQ(name, "DB_FOREIGN_CONFLICT", 19)) {
-    /*                             ^           */
-#ifdef DB_FOREIGN_CONFLICT
-      *iv_return = DB_FOREIGN_CONFLICT;
+    if (memEQ(name, "DB_REP_JOIN_FAILURE", 19)) {
+    /*                           ^             */
+#ifdef DB_REP_JOIN_FAILURE
+      *iv_return = DB_REP_JOIN_FAILURE;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_PRIORITY_DEFAULT", 19)) {
-    /*                             ^           */
-#if (DB_VERSION_MAJOR > 4) || \
-    (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1) || \
-    (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && \
-     DB_VERSION_PATCH >= 24)
-      *iv_return = DB_PRIORITY_DEFAULT;
+    break;
+  case 'G':
+    if (memEQ(name, "DB_USERCOPY_GETDATA", 19)) {
+    /*                           ^             */
+#ifdef DB_USERCOPY_GETDATA
+      *iv_return = DB_USERCOPY_GETDATA;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'G':
-    if (memEQ(name, "DB_TEST_POSTLOGMETA", 19)) {
-    /*                             ^           */
-#ifdef DB_TEST_POSTLOGMETA
-      *iv_return = DB_TEST_POSTLOGMETA;
+    if (memEQ(name, "DB_VERB_REPMGR_MISC", 19)) {
+    /*                           ^             */
+#ifdef DB_VERB_REPMGR_MISC
+      *iv_return = DB_VERB_REPMGR_MISC;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -5498,28 +5589,30 @@ constant_19 (pTHX_ const char *name, IV *iv_return) {
     }
     break;
   case 'I':
-    if (memEQ(name, "DB_READ_UNCOMMITTED", 19)) {
-    /*                             ^           */
-#ifdef DB_READ_UNCOMMITTED
-      *iv_return = DB_READ_UNCOMMITTED;
+    if (memEQ(name, "DB_VERB_REPLICATION", 19)) {
+    /*                           ^             */
+#ifdef DB_VERB_REPLICATION
+      *iv_return = DB_VERB_REPLICATION;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REP_JOIN_FAILURE", 19)) {
-    /*                             ^           */
-#ifdef DB_REP_JOIN_FAILURE
-      *iv_return = DB_REP_JOIN_FAILURE;
+    if (memEQ(name, "DB_VERSION_MISMATCH", 19)) {
+    /*                           ^             */
+#ifdef DB_VERSION_MISMATCH
+      *iv_return = DB_VERSION_MISMATCH;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_VERIFY_PARTITION", 19)) {
-    /*                             ^           */
-#ifdef DB_VERIFY_PARTITION
-      *iv_return = DB_VERIFY_PARTITION;
+    break;
+  case 'K':
+    if (memEQ(name, "DB_REPMGR_ACKS_NONE", 19)) {
+    /*                           ^             */
+#ifdef DB_REPMGR_ACKS_NONE
+      *iv_return = DB_REPMGR_ACKS_NONE;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -5527,19 +5620,28 @@ constant_19 (pTHX_ const char *name, IV *iv_return) {
     }
     break;
   case 'L':
-    if (memEQ(name, "DB_EVENT_REP_CLIENT", 19)) {
-    /*                             ^           */
-#ifdef DB_EVENT_REP_CLIENT
-      *iv_return = DB_EVENT_REP_CLIENT;
+    if (memEQ(name, "DB_DATABASE_LOCKING", 19)) {
+    /*                           ^             */
+#ifdef DB_DATABASE_LOCKING
+      *iv_return = DB_DATABASE_LOCKING;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_TEST_SUBDB_LOCKS", 19)) {
-    /*                             ^           */
-#ifdef DB_TEST_SUBDB_LOCKS
-      *iv_return = DB_TEST_SUBDB_LOCKS;
+    if (memEQ(name, "DB_REP_HOLDELECTION", 19)) {
+    /*                           ^             */
+#ifdef DB_REP_HOLDELECTION
+      *iv_return = DB_REP_HOLDELECTION;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    if (memEQ(name, "DB_TEST_POSTLOGMETA", 19)) {
+    /*                           ^             */
+#ifdef DB_TEST_POSTLOGMETA
+      *iv_return = DB_TEST_POSTLOGMETA;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -5547,51 +5649,48 @@ constant_19 (pTHX_ const char *name, IV *iv_return) {
     }
     break;
   case 'M':
-    if (memEQ(name, "DB_LOCK_GET_TIMEOUT", 19)) {
-    /*                             ^           */
-#if (DB_VERSION_MAJOR > 4) || \
-    (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || \
-    (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0 && \
-     DB_VERSION_PATCH >= 14)
-      *iv_return = DB_LOCK_GET_TIMEOUT;
+    if (memEQ(name, "DB_READ_UNCOMMITTED", 19)) {
+    /*                           ^             */
+#ifdef DB_READ_UNCOMMITTED
+      *iv_return = DB_READ_UNCOMMITTED;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_LOCK_SET_TIMEOUT", 19)) {
-    /*                             ^           */
-#ifdef DB_LOCK_SET_TIMEOUT
-      *iv_return = DB_LOCK_SET_TIMEOUT;
+    break;
+  case 'N':
+    if (memEQ(name, "DB_ENV_LOG_INMEMORY", 19)) {
+    /*                           ^             */
+#ifdef DB_ENV_LOG_INMEMORY
+      *iv_return = DB_ENV_LOG_INMEMORY;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_SET_LOCK_TIMEOUT", 19)) {
-    /*                             ^           */
-#ifdef DB_SET_LOCK_TIMEOUT
-      *iv_return = DB_SET_LOCK_TIMEOUT;
+    if (memEQ(name, "DB_ENV_TXN_SNAPSHOT", 19)) {
+    /*                           ^             */
+#ifdef DB_ENV_TXN_SNAPSHOT
+      *iv_return = DB_ENV_TXN_SNAPSHOT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_VERSION_MISMATCH", 19)) {
-    /*                             ^           */
-#ifdef DB_VERSION_MISMATCH
-      *iv_return = DB_VERSION_MISMATCH;
+    if (memEQ(name, "DB_REPMGR_CONNECTED", 19)) {
+    /*                           ^             */
+#ifdef DB_REPMGR_CONNECTED
+      *iv_return = DB_REPMGR_CONNECTED;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'N':
-    if (memEQ(name, "DB_UPDATE_SECONDARY", 19)) {
-    /*                             ^           */
-#ifdef DB_UPDATE_SECONDARY
-      *iv_return = DB_UPDATE_SECONDARY;
+    if (memEQ(name, "DB_TXN_LOG_UNDOREDO", 19)) {
+    /*                           ^             */
+#ifdef DB_TXN_LOG_UNDOREDO
+      *iv_return = DB_TXN_LOG_UNDOREDO;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -5599,39 +5698,37 @@ constant_19 (pTHX_ const char *name, IV *iv_return) {
     }
     break;
   case 'O':
-    if (memEQ(name, "DB_LOCK_FREE_LOCKER", 19)) {
-    /*                             ^           */
-#ifdef DB_LOCK_FREE_LOCKER
-      *iv_return = DB_LOCK_FREE_LOCKER;
+    if (memEQ(name, "DB_ENV_REP_LOGSONLY", 19)) {
+    /*                           ^             */
+#ifdef DB_ENV_REP_LOGSONLY
+      *iv_return = DB_ENV_REP_LOGSONLY;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_TXN_LOG_UNDOREDO", 19)) {
-    /*                             ^           */
-#ifdef DB_TXN_LOG_UNDOREDO
-      *iv_return = DB_TXN_LOG_UNDOREDO;
+    if (memEQ(name, "DB_FOREIGN_CONFLICT", 19)) {
+    /*                           ^             */
+#ifdef DB_FOREIGN_CONFLICT
+      *iv_return = DB_FOREIGN_CONFLICT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_TXN_WRITE_NOSYNC", 19)) {
-    /*                             ^           */
-#ifdef DB_TXN_WRITE_NOSYNC
-      *iv_return = DB_TXN_WRITE_NOSYNC;
+    if (memEQ(name, "DB_USE_ENVIRON_ROOT", 19)) {
+    /*                           ^             */
+#ifdef DB_USE_ENVIRON_ROOT
+      *iv_return = DB_USE_ENVIRON_ROOT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    break;
-  case 'P':
-    if (memEQ(name, "DB_ENV_TXN_SNAPSHOT", 19)) {
-    /*                             ^           */
-#ifdef DB_ENV_TXN_SNAPSHOT
-      *iv_return = DB_ENV_TXN_SNAPSHOT;
+    if (memEQ(name, "DB_VERB_FILEOPS_ALL", 19)) {
+    /*                           ^             */
+#ifdef DB_VERB_FILEOPS_ALL
+      *iv_return = DB_VERB_FILEOPS_ALL;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -5639,19 +5736,22 @@ constant_19 (pTHX_ const char *name, IV *iv_return) {
     }
     break;
   case 'R':
-    if (memEQ(name, "DB_ENV_MULTIVERSION", 19)) {
-    /*                             ^           */
-#ifdef DB_ENV_MULTIVERSION
-      *iv_return = DB_ENV_MULTIVERSION;
+    if (memEQ(name, "DB_TXN_FORWARD_ROLL", 19)) {
+    /*                           ^             */
+#if (DB_VERSION_MAJOR > 3) || \
+    (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 1) || \
+    (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR == 1 && \
+     DB_VERSION_PATCH >= 14)
+      *iv_return = DB_TXN_FORWARD_ROLL;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_SEQUENCE_VERSION", 19)) {
-    /*                             ^           */
-#ifdef DB_SEQUENCE_VERSION
-      *iv_return = DB_SEQUENCE_VERSION;
+    if (memEQ(name, "DB_VERIFY_PARTITION", 19)) {
+    /*                           ^             */
+#ifdef DB_VERIFY_PARTITION
+      *iv_return = DB_VERIFY_PARTITION;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -5659,57 +5759,62 @@ constant_19 (pTHX_ const char *name, IV *iv_return) {
     }
     break;
   case 'S':
-    if (memEQ(name, "DB_CURSOR_TRANSIENT", 19)) {
-    /*                             ^           */
-#ifdef DB_CURSOR_TRANSIENT
-      *iv_return = DB_CURSOR_TRANSIENT;
+    if (memEQ(name, "DB_USERCOPY_SETDATA", 19)) {
+    /*                           ^             */
+#ifdef DB_USERCOPY_SETDATA
+      *iv_return = DB_USERCOPY_SETDATA;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_ENV_REP_LOGSONLY", 19)) {
-    /*                             ^           */
-#ifdef DB_ENV_REP_LOGSONLY
-      *iv_return = DB_ENV_REP_LOGSONLY;
+    break;
+  case 'T':
+    if (memEQ(name, "DB_LOCK_GET_TIMEOUT", 19)) {
+    /*                           ^             */
+#if (DB_VERSION_MAJOR > 4) || \
+    (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) || \
+    (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 0 && \
+     DB_VERSION_PATCH >= 14)
+      *iv_return = DB_LOCK_GET_TIMEOUT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_TEST_POSTDESTROY", 19)) {
-    /*                             ^           */
-#ifdef DB_TEST_POSTDESTROY
-      *iv_return = DB_TEST_POSTDESTROY;
+    if (memEQ(name, "DB_LOCK_SET_TIMEOUT", 19)) {
+    /*                           ^             */
+#ifdef DB_LOCK_SET_TIMEOUT
+      *iv_return = DB_LOCK_SET_TIMEOUT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_VERB_FILEOPS_ALL", 19)) {
-    /*                             ^           */
-#ifdef DB_VERB_FILEOPS_ALL
-      *iv_return = DB_VERB_FILEOPS_ALL;
+    if (memEQ(name, "DB_SET_LOCK_TIMEOUT", 19)) {
+    /*                           ^             */
+#ifdef DB_SET_LOCK_TIMEOUT
+      *iv_return = DB_SET_LOCK_TIMEOUT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'T':
-    if (memEQ(name, "DB_USERCOPY_GETDATA", 19)) {
-    /*                             ^           */
-#ifdef DB_USERCOPY_GETDATA
-      *iv_return = DB_USERCOPY_GETDATA;
+  case 'V':
+    if (memEQ(name, "DB_ENV_MULTIVERSION", 19)) {
+    /*                           ^             */
+#ifdef DB_ENV_MULTIVERSION
+      *iv_return = DB_ENV_MULTIVERSION;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_USERCOPY_SETDATA", 19)) {
-    /*                             ^           */
-#ifdef DB_USERCOPY_SETDATA
-      *iv_return = DB_USERCOPY_SETDATA;
+    if (memEQ(name, "DB_SEQUENCE_VERSION", 19)) {
+    /*                           ^             */
+#ifdef DB_SEQUENCE_VERSION
+      *iv_return = DB_SEQUENCE_VERSION;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -5717,40 +5822,64 @@ constant_19 (pTHX_ const char *name, IV *iv_return) {
     }
     break;
   case '_':
-    if (memEQ(name, "DB_REPMGR_ACKS_NONE", 19)) {
-    /*                             ^           */
-#ifdef DB_REPMGR_ACKS_NONE
-      *iv_return = DB_REPMGR_ACKS_NONE;
+    if (memEQ(name, "DB_BOOTSTRAP_HELPER", 19)) {
+    /*                           ^             */
+#ifdef DB_BOOTSTRAP_HELPER
+      *iv_return = DB_BOOTSTRAP_HELPER;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_TXN_FORWARD_ROLL", 19)) {
-    /*                             ^           */
-#if (DB_VERSION_MAJOR > 3) || \
-    (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 1) || \
-    (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR == 1 && \
-     DB_VERSION_PATCH >= 14)
-      *iv_return = DB_TXN_FORWARD_ROLL;
+    if (memEQ(name, "DB_EVENT_REP_CLIENT", 19)) {
+    /*                           ^             */
+#ifdef DB_EVENT_REP_CLIENT
+      *iv_return = DB_EVENT_REP_CLIENT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_USE_ENVIRON_ROOT", 19)) {
-    /*                             ^           */
-#ifdef DB_USE_ENVIRON_ROOT
-      *iv_return = DB_USE_ENVIRON_ROOT;
+    if (memEQ(name, "DB_EVENT_REP_MASTER", 19)) {
+    /*                           ^             */
+#ifdef DB_EVENT_REP_MASTER
+      *iv_return = DB_EVENT_REP_MASTER;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_VERB_REPMGR_MISC", 19)) {
-    /*                             ^           */
-#ifdef DB_VERB_REPMGR_MISC
-      *iv_return = DB_VERB_REPMGR_MISC;
+    if (memEQ(name, "DB_EXIT_FILE_EXISTS", 19)) {
+    /*                           ^             */
+#ifdef DB_EXIT_FILE_EXISTS
+      *iv_return = DB_EXIT_FILE_EXISTS;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    if (memEQ(name, "DB_LOCK_FREE_LOCKER", 19)) {
+    /*                           ^             */
+#ifdef DB_LOCK_FREE_LOCKER
+      *iv_return = DB_LOCK_FREE_LOCKER;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    if (memEQ(name, "DB_STAT_LOCK_PARAMS", 19)) {
+    /*                           ^             */
+#ifdef DB_STAT_LOCK_PARAMS
+      *iv_return = DB_STAT_LOCK_PARAMS;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    if (memEQ(name, "DB_TXN_WRITE_NOSYNC", 19)) {
+    /*                           ^             */
+#ifdef DB_TXN_WRITE_NOSYNC
+      *iv_return = DB_TXN_WRITE_NOSYNC;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -5772,7 +5901,7 @@ constant_20 (pTHX_ const char *name, IV *iv_return) {
      DB_PRIORITY_VERY_LOW DB_REP_CONF_AUTOINIT DB_REP_FULL_ELECTION
      DB_REP_LEASE_EXPIRED DB_REP_LEASE_TIMEOUT DB_REP_WOULDROLLBACK
      DB_STAT_LOCK_LOCKERS DB_STAT_LOCK_OBJECTS DB_STAT_MEMP_NOERROR
-     DB_TXN_BACKWARD_ROLL DB_TXN_LOCK_OPTIMIST */
+     DB_STREAM_SYNC_WRITE DB_TXN_BACKWARD_ROLL DB_TXN_LOCK_OPTIMIST */
   /* Offset 15 gives the best switch position.  */
   switch (name[15]) {
   case 'B':
@@ -5792,7 +5921,7 @@ constant_20 (pTHX_ const char *name, IV *iv_return) {
 #if (DB_VERSION_MAJOR > 5) || \
     (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \
     (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \
-     DB_VERSION_PATCH >= 5)
+     DB_VERSION_PATCH >= 15)
       *iv_return = DB_BACKUP_READ_COUNT;
       return PERL_constant_ISIV;
 #else
@@ -5959,7 +6088,7 @@ constant_20 (pTHX_ const char *name, IV *iv_return) {
 #if (DB_VERSION_MAJOR > 5) || \
     (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \
     (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \
-     DB_VERSION_PATCH >= 5)
+     DB_VERSION_PATCH >= 15)
       *iv_return = DB_BACKUP_READ_SLEEP;
       return PERL_constant_ISIV;
 #else
@@ -5998,6 +6127,17 @@ constant_20 (pTHX_ const char *name, IV *iv_return) {
 #endif
     }
     break;
+  case 'W':
+    if (memEQ(name, "DB_STREAM_SYNC_WRITE", 20)) {
+    /*                              ^           */
+#ifdef DB_STREAM_SYNC_WRITE
+      *iv_return = DB_STREAM_SYNC_WRITE;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    break;
   case 'Y':
     if (memEQ(name, "DB_PRIORITY_VERY_LOW", 20)) {
     /*                              ^           */
@@ -6209,10 +6349,10 @@ constant_22 (pTHX_ const char *name, IV *iv_return, const char **pv_return) {
   /* When generated this function returned values for the list of names given
      here.  However, subsequent manual editing may have added or removed some.
      DB_ASSOC_IMMUTABLE_KEY DB_BACKUP_WRITE_DIRECT DB_ENV_RPCCLIENT_GIVEN
-     DB_ENV_TIME_NOTGRANTED DB_ENV_TXN_NOT_DURABLE DB_EVENT_NO_SUCH_EVENT
-     DB_EVENT_REP_DUPMASTER DB_EVENT_REP_INIT_DONE DB_EVENT_REP_NEWMASTER
-     DB_LOGVERSION_LATCHING DB_REPMGR_DISCONNECTED DB_REP_CONF_NOAUTOINIT
-     DB_TXN_LOCK_OPTIMISTIC DB_VERSION_FULL_STRING */
+     DB_ENV_TIME_NOTGRANTED DB_ENV_TXN_NOT_DURABLE DB_EVENT_FAILCHK_PANIC
+     DB_EVENT_NO_SUCH_EVENT DB_EVENT_REP_DUPMASTER DB_EVENT_REP_INIT_DONE
+     DB_EVENT_REP_NEWMASTER DB_LOGVERSION_LATCHING DB_REPMGR_DISCONNECTED
+     DB_REP_CONF_NOAUTOINIT DB_TXN_LOCK_OPTIMISTIC DB_VERSION_FULL_STRING */
   /* Offset 15 gives the best switch position.  */
   switch (name[15]) {
   case 'A':
@@ -6290,6 +6430,17 @@ constant_22 (pTHX_ const char *name, IV *iv_return, const char **pv_return) {
 #endif
     }
     break;
+  case 'K':
+    if (memEQ(name, "DB_EVENT_FAILCHK_PANIC", 22)) {
+    /*                              ^             */
+#ifdef DB_EVENT_FAILCHK_PANIC
+      *iv_return = DB_EVENT_FAILCHK_PANIC;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    break;
   case 'N':
     if (memEQ(name, "DB_REPMGR_DISCONNECTED", 22)) {
     /*                              ^             */
@@ -6351,7 +6502,7 @@ constant_22 (pTHX_ const char *name, IV *iv_return, const char **pv_return) {
 #if (DB_VERSION_MAJOR > 5) || \
     (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \
     (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \
-     DB_VERSION_PATCH >= 5)
+     DB_VERSION_PATCH >= 15)
       *iv_return = DB_BACKUP_WRITE_DIRECT;
       return PERL_constant_ISIV;
 #else
@@ -6377,9 +6528,9 @@ constant_23 (pTHX_ const char *name, IV *iv_return) {
   /* When generated this function returned values for the list of names given
      here.  However, subsequent manual editing may have added or removed some.
      DB_ENV_DATABASE_LOCKING DB_ENV_TXN_WRITE_NOSYNC DB_EVENT_REP_SITE_ADDED
-     DB_REPMGR_ACKS_ONE_PEER DB_REPMGR_NEED_RESPONSE DB_REP_CHECKPOINT_DELAY
-     DB_REP_CONF_DELAYCLIENT DB_REP_CONNECTION_RETRY DB_REP_DEFAULT_PRIORITY
-     DB_REP_ELECTION_TIMEOUT DB_VERB_REPMGR_CONNFAIL */
+     DB_FAILURE_SYMPTOM_SIZE DB_REPMGR_ACKS_ONE_PEER DB_REPMGR_NEED_RESPONSE
+     DB_REP_CHECKPOINT_DELAY DB_REP_CONF_DELAYCLIENT DB_REP_CONNECTION_RETRY
+     DB_REP_DEFAULT_PRIORITY DB_REP_ELECTION_TIMEOUT DB_VERB_REPMGR_CONNFAIL */
   /* Offset 12 gives the best switch position.  */
   switch (name[12]) {
   case 'A':
@@ -6492,6 +6643,17 @@ constant_23 (pTHX_ const char *name, IV *iv_return) {
 #endif
     }
     break;
+  case 'Y':
+    if (memEQ(name, "DB_FAILURE_SYMPTOM_SIZE", 23)) {
+    /*                           ^                 */
+#ifdef DB_FAILURE_SYMPTOM_SIZE
+      *iv_return = DB_FAILURE_SYMPTOM_SIZE;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    break;
   case '_':
     if (memEQ(name, "DB_EVENT_REP_SITE_ADDED", 23)) {
     /*                           ^                 */
@@ -6512,26 +6674,36 @@ constant_24 (pTHX_ const char *name, IV *iv_return) {
   /* When generated this function returned values for the list of names given
      here.  However, subsequent manual editing may have added or removed some.
      DB_EVENT_REP_PERM_FAILED DB_EVENT_REP_STARTUPDONE DB_HOTBACKUP_IN_PROGRESS
-     DB_INTERNAL_TEMPORARY_DB DB_REPMGR_ACKS_ALL_PEERS DB_REPMGR_CONF_ELECTIONS
-     DB_REP_CONF_AUTOROLLBACK DB_REP_HEARTBEAT_MONITOR */
-  /* Offset 22 gives the best switch position.  */
-  switch (name[22]) {
-  case 'C':
-    if (memEQ(name, "DB_REP_CONF_AUTOROLLBACK", 24)) {
-    /*                                     ^        */
-#ifdef DB_REP_CONF_AUTOROLLBACK
-      *iv_return = DB_REP_CONF_AUTOROLLBACK;
+     DB_INTERNAL_TEMPORARY_DB DB_MUTEX_DESCRIBE_STRLEN DB_REPMGR_ACKS_ALL_PEERS
+     DB_REPMGR_CONF_ELECTIONS DB_REP_CONF_AUTOROLLBACK DB_REP_HEARTBEAT_MONITOR
+     */
+  /* Offset 15 gives the best switch position.  */
+  switch (name[15]) {
+  case 'A':
+    if (memEQ(name, "DB_EVENT_REP_STARTUPDONE", 24)) {
+    /*                              ^               */
+#ifdef DB_EVENT_REP_STARTUPDONE
+      *iv_return = DB_EVENT_REP_STARTUPDONE;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    if (memEQ(name, "DB_REPMGR_ACKS_ALL_PEERS", 24)) {
+    /*                              ^               */
+#ifdef DB_REPMGR_ACKS_ALL_PEERS
+      *iv_return = DB_REPMGR_ACKS_ALL_PEERS;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'D':
-    if (memEQ(name, "DB_INTERNAL_TEMPORARY_DB", 24)) {
-    /*                                     ^        */
-#ifdef DB_INTERNAL_TEMPORARY_DB
-      *iv_return = DB_INTERNAL_TEMPORARY_DB;
+  case 'B':
+    if (memEQ(name, "DB_MUTEX_DESCRIBE_STRLEN", 24)) {
+    /*                              ^               */
+#ifdef DB_MUTEX_DESCRIBE_STRLEN
+      *iv_return = DB_MUTEX_DESCRIBE_STRLEN;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -6539,61 +6711,63 @@ constant_24 (pTHX_ const char *name, IV *iv_return) {
     }
     break;
   case 'E':
-    if (memEQ(name, "DB_EVENT_REP_PERM_FAILED", 24)) {
-    /*                                     ^        */
-#ifdef DB_EVENT_REP_PERM_FAILED
-      *iv_return = DB_EVENT_REP_PERM_FAILED;
+    if (memEQ(name, "DB_REPMGR_CONF_ELECTIONS", 24)) {
+    /*                              ^               */
+#ifdef DB_REPMGR_CONF_ELECTIONS
+      *iv_return = DB_REPMGR_CONF_ELECTIONS;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'N':
-    if (memEQ(name, "DB_EVENT_REP_STARTUPDONE", 24)) {
-    /*                                     ^        */
-#ifdef DB_EVENT_REP_STARTUPDONE
-      *iv_return = DB_EVENT_REP_STARTUPDONE;
+  case 'O':
+    if (memEQ(name, "DB_REP_CONF_AUTOROLLBACK", 24)) {
+    /*                              ^               */
+#ifdef DB_REP_CONF_AUTOROLLBACK
+      *iv_return = DB_REP_CONF_AUTOROLLBACK;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
-    if (memEQ(name, "DB_REPMGR_CONF_ELECTIONS", 24)) {
-    /*                                     ^        */
-#ifdef DB_REPMGR_CONF_ELECTIONS
-      *iv_return = DB_REPMGR_CONF_ELECTIONS;
+    break;
+  case 'P':
+    if (memEQ(name, "DB_INTERNAL_TEMPORARY_DB", 24)) {
+    /*                              ^               */
+#ifdef DB_INTERNAL_TEMPORARY_DB
+      *iv_return = DB_INTERNAL_TEMPORARY_DB;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'O':
-    if (memEQ(name, "DB_REP_HEARTBEAT_MONITOR", 24)) {
-    /*                                     ^        */
-#ifdef DB_REP_HEARTBEAT_MONITOR
-      *iv_return = DB_REP_HEARTBEAT_MONITOR;
+  case 'R':
+    if (memEQ(name, "DB_EVENT_REP_PERM_FAILED", 24)) {
+    /*                              ^               */
+#ifdef DB_EVENT_REP_PERM_FAILED
+      *iv_return = DB_EVENT_REP_PERM_FAILED;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'R':
-    if (memEQ(name, "DB_REPMGR_ACKS_ALL_PEERS", 24)) {
-    /*                                     ^        */
-#ifdef DB_REPMGR_ACKS_ALL_PEERS
-      *iv_return = DB_REPMGR_ACKS_ALL_PEERS;
+  case 'T':
+    if (memEQ(name, "DB_REP_HEARTBEAT_MONITOR", 24)) {
+    /*                              ^               */
+#ifdef DB_REP_HEARTBEAT_MONITOR
+      *iv_return = DB_REP_HEARTBEAT_MONITOR;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'S':
+  case '_':
     if (memEQ(name, "DB_HOTBACKUP_IN_PROGRESS", 24)) {
-    /*                                     ^        */
+    /*                              ^               */
 #ifdef DB_HOTBACKUP_IN_PROGRESS
       *iv_return = DB_HOTBACKUP_IN_PROGRESS;
       return PERL_constant_ISIV;
@@ -6610,8 +6784,9 @@ static int
 constant_25 (pTHX_ const char *name, IV *iv_return) {
   /* When generated this function returned values for the list of names given
      here.  However, subsequent manual editing may have added or removed some.
-     DB_EVENT_REP_CONNECT_ESTD DB_EVENT_REP_JOIN_FAILURE
-     DB_EVENT_REP_SITE_REMOVED DB_INTERNAL_PERSISTENT_DB */
+     DB_EVENT_REP_CONNECT_ESTD DB_EVENT_REP_INQUEUE_FULL
+     DB_EVENT_REP_JOIN_FAILURE DB_EVENT_REP_SITE_REMOVED
+     DB_INTERNAL_PERSISTENT_DB */
   /* Offset 15 gives the best switch position.  */
   switch (name[15]) {
   case 'I':
@@ -6636,6 +6811,17 @@ constant_25 (pTHX_ const char *name, IV *iv_return) {
 #endif
     }
     break;
+  case 'Q':
+    if (memEQ(name, "DB_EVENT_REP_INQUEUE_FULL", 25)) {
+    /*                              ^                */
+#ifdef DB_EVENT_REP_INQUEUE_FULL
+      *iv_return = DB_EVENT_REP_INQUEUE_FULL;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    break;
   case 'S':
     if (memEQ(name, "DB_INTERNAL_PERSISTENT_DB", 25)) {
     /*                              ^                */
@@ -6667,36 +6853,48 @@ constant_27 (pTHX_ const char *name, IV *iv_return) {
   /* When generated this function returned values for the list of names given
      here.  However, subsequent manual editing may have added or removed some.
      DB_EVENT_REP_CONNECT_BROKEN DB_EVENT_REP_MASTER_FAILURE
-     DB_EVENT_REP_WOULD_ROLLBACK DB_REPMGR_CONF_2SITE_STRICT */
-  /* Offset 16 gives the best switch position.  */
-  switch (name[16]) {
-  case 'L':
-    if (memEQ(name, "DB_EVENT_REP_WOULD_ROLLBACK", 27)) {
-    /*                               ^                 */
-#ifdef DB_EVENT_REP_WOULD_ROLLBACK
-      *iv_return = DB_EVENT_REP_WOULD_ROLLBACK;
+     DB_EVENT_REP_WOULD_ROLLBACK DB_REPMGR_CONF_2SITE_STRICT
+     DB_REP_CONF_ELECT_LOGLENGTH */
+  /* Offset 26 gives the best switch position.  */
+  switch (name[26]) {
+  case 'E':
+    if (memEQ(name, "DB_EVENT_REP_MASTER_FAILUR", 26)) {
+    /*                                         E      */
+#ifdef DB_EVENT_REP_MASTER_FAILURE
+      *iv_return = DB_EVENT_REP_MASTER_FAILURE;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'N':
-    if (memEQ(name, "DB_EVENT_REP_CONNECT_BROKEN", 27)) {
-    /*                               ^                 */
-#ifdef DB_EVENT_REP_CONNECT_BROKEN
-      *iv_return = DB_EVENT_REP_CONNECT_BROKEN;
+  case 'H':
+    if (memEQ(name, "DB_REP_CONF_ELECT_LOGLENGT", 26)) {
+    /*                                         H      */
+#ifdef DB_REP_CONF_ELECT_LOGLENGTH
+      *iv_return = DB_REP_CONF_ELECT_LOGLENGTH;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
 #endif
     }
     break;
-  case 'S':
-    if (memEQ(name, "DB_REPMGR_CONF_2SITE_STRICT", 27)) {
-    /*                               ^                 */
-#ifdef DB_REPMGR_CONF_2SITE_STRICT
-      *iv_return = DB_REPMGR_CONF_2SITE_STRICT;
+  case 'K':
+    if (memEQ(name, "DB_EVENT_REP_WOULD_ROLLBAC", 26)) {
+    /*                                         K      */
+#ifdef DB_EVENT_REP_WOULD_ROLLBACK
+      *iv_return = DB_EVENT_REP_WOULD_ROLLBACK;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    break;
+  case 'N':
+    if (memEQ(name, "DB_EVENT_REP_CONNECT_BROKE", 26)) {
+    /*                                         N      */
+#ifdef DB_EVENT_REP_CONNECT_BROKEN
+      *iv_return = DB_EVENT_REP_CONNECT_BROKEN;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -6704,10 +6902,10 @@ constant_27 (pTHX_ const char *name, IV *iv_return) {
     }
     break;
   case 'T':
-    if (memEQ(name, "DB_EVENT_REP_MASTER_FAILURE", 27)) {
-    /*                               ^                 */
-#ifdef DB_EVENT_REP_MASTER_FAILURE
-      *iv_return = DB_EVENT_REP_MASTER_FAILURE;
+    if (memEQ(name, "DB_REPMGR_CONF_2SITE_STRIC", 26)) {
+    /*                                         T      */
+#ifdef DB_REPMGR_CONF_2SITE_STRICT
+      *iv_return = DB_REPMGR_CONF_2SITE_STRICT;
       return PERL_constant_ISIV;
 #else
       return PERL_constant_NOTDEF;
@@ -6723,7 +6921,7 @@ constant_28 (pTHX_ const char *name, IV *iv_return) {
   /* When generated this function returned values for the list of names given
      here.  However, subsequent manual editing may have added or removed some.
      DB_EVENT_REP_ELECTION_FAILED DB_REPMGR_ACKS_ALL_AVAILABLE
-     DB_REP_FULL_ELECTION_TIMEOUT */
+     DB_REP_FULL_ELECTION_TIMEOUT DB_SET_MUTEX_FAILCHK_TIMEOUT */
   /* Offset 15 gives the best switch position.  */
   switch (name[15]) {
   case 'A':
@@ -6759,6 +6957,17 @@ constant_28 (pTHX_ const char *name, IV *iv_return) {
 #endif
     }
     break;
+  case 'I':
+    if (memEQ(name, "DB_SET_MUTEX_FAILCHK_TIMEOUT", 28)) {
+    /*                              ^                   */
+#ifdef DB_SET_MUTEX_FAILCHK_TIMEOUT
+      *iv_return = DB_SET_MUTEX_FAILCHK_TIMEOUT;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    break;
   }
   return PERL_constant_NOTFOUND;
 }
@@ -6788,21 +6997,22 @@ my @names = (qw(DB2_AM_EXCL DB2_AM_INTEXCL DB2_AM_NOWAIT DB_AFTER DB_AGGRESSIVE
 	       DB_BACKUP_SINGLE_DIR DB_BACKUP_UPDATE DB_BEFORE
 	       DB_BOOTSTRAP_HELPER DB_BTREEMAGIC DB_BTREEOLDVER DB_BTREEVERSION
 	       DB_BUFFER_SMALL DB_CACHED_COUNTS DB_CDB_ALLDB DB_CHECKPOINT
-	       DB_CHKSUM DB_CHKSUM_SHA1 DB_CKP_INTERNAL DB_CLIENT DB_CL_WRITER
-	       DB_COMMIT DB_COMPACT_FLAGS DB_CONSUME DB_CONSUME_WAIT DB_CREATE
-	       DB_CURLSN DB_CURRENT DB_CURSOR_BULK DB_CURSOR_TRANSIENT
-	       DB_CXX_NO_EXCEPTIONS DB_DATABASE_LOCK DB_DATABASE_LOCKING
-	       DB_DEGREE_2 DB_DELETED DB_DELIMITER DB_DIRECT DB_DIRECT_DB
-	       DB_DIRECT_LOG DB_DIRTY_READ DB_DONOTINDEX DB_DSYNC_DB
-	       DB_DSYNC_LOG DB_DUP DB_DUPCURSOR DB_DUPSORT DB_DURABLE_UNKNOWN
-	       DB_EID_BROADCAST DB_EID_INVALID DB_EID_MASTER DB_ENCRYPT
-	       DB_ENCRYPT_AES DB_ENV_APPINIT DB_ENV_AUTO_COMMIT DB_ENV_CDB
-	       DB_ENV_CDB_ALLDB DB_ENV_CREATE DB_ENV_DATABASE_LOCKING
-	       DB_ENV_DBLOCAL DB_ENV_DIRECT_DB DB_ENV_DIRECT_LOG
-	       DB_ENV_DSYNC_DB DB_ENV_DSYNC_LOG DB_ENV_FAILCHK DB_ENV_FATAL
-	       DB_ENV_HOTBACKUP DB_ENV_LOCKDOWN DB_ENV_LOCKING DB_ENV_LOGGING
-	       DB_ENV_LOG_AUTOREMOVE DB_ENV_LOG_INMEMORY DB_ENV_MULTIVERSION
-	       DB_ENV_NOFLUSH DB_ENV_NOLOCKING DB_ENV_NOMMAP DB_ENV_NOPANIC
+	       DB_CHKSUM DB_CHKSUM_FAIL DB_CHKSUM_SHA1 DB_CKP_INTERNAL
+	       DB_CLIENT DB_CL_WRITER DB_COMMIT DB_COMPACT_FLAGS DB_CONSUME
+	       DB_CONSUME_WAIT DB_CREATE DB_CURLSN DB_CURRENT DB_CURSOR_BULK
+	       DB_CURSOR_TRANSIENT DB_CXX_NO_EXCEPTIONS DB_DATABASE_LOCK
+	       DB_DATABASE_LOCKING DB_DEGREE_2 DB_DELETED DB_DELIMITER
+	       DB_DIRECT DB_DIRECT_DB DB_DIRECT_LOG DB_DIRTY_READ DB_DONOTINDEX
+	       DB_DSYNC_DB DB_DSYNC_LOG DB_DUP DB_DUPCURSOR DB_DUPSORT
+	       DB_DURABLE_UNKNOWN DB_EID_BROADCAST DB_EID_INVALID DB_EID_MASTER
+	       DB_ENCRYPT DB_ENCRYPT_AES DB_ENV_APPINIT DB_ENV_AUTO_COMMIT
+	       DB_ENV_CDB DB_ENV_CDB_ALLDB DB_ENV_CREATE
+	       DB_ENV_DATABASE_LOCKING DB_ENV_DBLOCAL DB_ENV_DIRECT_DB
+	       DB_ENV_DIRECT_LOG DB_ENV_DSYNC_DB DB_ENV_DSYNC_LOG
+	       DB_ENV_FAILCHK DB_ENV_FATAL DB_ENV_HOTBACKUP DB_ENV_LOCKDOWN
+	       DB_ENV_LOCKING DB_ENV_LOGGING DB_ENV_LOG_AUTOREMOVE
+	       DB_ENV_LOG_INMEMORY DB_ENV_MULTIVERSION DB_ENV_NOFLUSH
+	       DB_ENV_NOLOCKING DB_ENV_NOMMAP DB_ENV_NOPANIC
 	       DB_ENV_NO_OUTPUT_SET DB_ENV_OPEN_CALLED DB_ENV_OVERWRITE
 	       DB_ENV_PRIVATE DB_ENV_RECOVER_FATAL DB_ENV_REF_COUNTED
 	       DB_ENV_REGION_INIT DB_ENV_REP_CLIENT DB_ENV_REP_LOGSONLY
@@ -6811,18 +7021,21 @@ my @names = (qw(DB2_AM_EXCL DB2_AM_INTEXCL DB2_AM_NOWAIT DB_AFTER DB_AGGRESSIVE
 	       DB_ENV_TIME_NOTGRANTED DB_ENV_TXN DB_ENV_TXN_NOSYNC
 	       DB_ENV_TXN_NOT_DURABLE DB_ENV_TXN_NOWAIT DB_ENV_TXN_SNAPSHOT
 	       DB_ENV_TXN_WRITE_NOSYNC DB_ENV_USER_ALLOC DB_ENV_YIELDCPU
-	       DB_EVENT_NOT_HANDLED DB_EVENT_NO_SUCH_EVENT DB_EVENT_PANIC
-	       DB_EVENT_REG_ALIVE DB_EVENT_REG_PANIC DB_EVENT_REP_CLIENT
-	       DB_EVENT_REP_CONNECT_BROKEN DB_EVENT_REP_CONNECT_ESTD
-	       DB_EVENT_REP_CONNECT_TRY_FAILED DB_EVENT_REP_DUPMASTER
-	       DB_EVENT_REP_ELECTED DB_EVENT_REP_ELECTION_FAILED
-	       DB_EVENT_REP_INIT_DONE DB_EVENT_REP_JOIN_FAILURE
+	       DB_EVENT_FAILCHK_PANIC DB_EVENT_MUTEX_DIED DB_EVENT_NOT_HANDLED
+	       DB_EVENT_NO_SUCH_EVENT DB_EVENT_PANIC DB_EVENT_REG_ALIVE
+	       DB_EVENT_REG_PANIC DB_EVENT_REP_AUTOTAKEOVER_FAILED
+	       DB_EVENT_REP_CLIENT DB_EVENT_REP_CONNECT_BROKEN
+	       DB_EVENT_REP_CONNECT_ESTD DB_EVENT_REP_CONNECT_TRY_FAILED
+	       DB_EVENT_REP_DUPMASTER DB_EVENT_REP_ELECTED
+	       DB_EVENT_REP_ELECTION_FAILED DB_EVENT_REP_INIT_DONE
+	       DB_EVENT_REP_INQUEUE_FULL DB_EVENT_REP_JOIN_FAILURE
 	       DB_EVENT_REP_LOCAL_SITE_REMOVED DB_EVENT_REP_MASTER
 	       DB_EVENT_REP_MASTER_FAILURE DB_EVENT_REP_NEWMASTER
 	       DB_EVENT_REP_PERM_FAILED DB_EVENT_REP_SITE_ADDED
 	       DB_EVENT_REP_SITE_REMOVED DB_EVENT_REP_STARTUPDONE
 	       DB_EVENT_REP_WOULD_ROLLBACK DB_EVENT_WRITE_FAILED DB_EXCL
-	       DB_EXTENT DB_FAILCHK DB_FAILCHK_ISALIVE DB_FAST_STAT
+	       DB_EXIT_FAILCHK DB_EXIT_FILE_EXISTS DB_EXTENT DB_FAILCHK
+	       DB_FAILCHK_ISALIVE DB_FAILURE_SYMPTOM_SIZE DB_FAST_STAT
 	       DB_FCNTL_LOCKING DB_FILEOPEN DB_FILE_ID_LEN DB_FIRST DB_FIXEDLEN
 	       DB_FLUSH DB_FORCE DB_FORCESYNC DB_FOREIGN_ABORT
 	       DB_FOREIGN_CASCADE DB_FOREIGN_CONFLICT DB_FOREIGN_NULLIFY
@@ -6833,25 +7046,26 @@ my @names = (qw(DB2_AM_EXCL DB2_AM_INTEXCL DB2_AM_NOWAIT DB_AFTER DB_AGGRESSIVE
 	       DB_HEAPVERSION DB_HEAP_FULL DB_HEAP_RID_SZ
 	       DB_HOTBACKUP_IN_PROGRESS DB_IGNORE_LEASE DB_IMMUTABLE_KEY
 	       DB_INCOMPLETE DB_INIT_CDB DB_INIT_LOCK DB_INIT_LOG DB_INIT_MPOOL
-	       DB_INIT_MUTEX DB_INIT_REP DB_INIT_TXN DB_INORDER DB_INTERNAL_DB
-	       DB_INTERNAL_PERSISTENT_DB DB_INTERNAL_TEMPORARY_DB
-	       DB_JAVA_CALLBACK DB_JOINENV DB_JOIN_ITEM DB_JOIN_NOSORT
-	       DB_KEYEMPTY DB_KEYEXIST DB_KEYFIRST DB_KEYLAST DB_LAST DB_LEGACY
-	       DB_LOCAL_SITE DB_LOCKDOWN DB_LOCKMAGIC DB_LOCKVERSION
-	       DB_LOCK_ABORT DB_LOCK_CHECK DB_LOCK_CONFLICT DB_LOCK_DEADLOCK
-	       DB_LOCK_DEFAULT DB_LOCK_EXPIRE DB_LOCK_FREE_LOCKER
-	       DB_LOCK_IGNORE_REC DB_LOCK_MAXLOCKS DB_LOCK_MAXWRITE
-	       DB_LOCK_MINLOCKS DB_LOCK_MINWRITE DB_LOCK_NORUN DB_LOCK_NOTEXIST
-	       DB_LOCK_NOTGRANTED DB_LOCK_NOTHELD DB_LOCK_NOWAIT DB_LOCK_OLDEST
-	       DB_LOCK_RANDOM DB_LOCK_RECORD DB_LOCK_REMOVE DB_LOCK_RIW_N
-	       DB_LOCK_RW_N DB_LOCK_SET_TIMEOUT DB_LOCK_SWITCH DB_LOCK_UPGRADE
-	       DB_LOCK_YOUNGEST DB_LOGCHKSUM DB_LOGC_BUF_SIZE
-	       DB_LOGFILEID_INVALID DB_LOGMAGIC DB_LOGOLDVER DB_LOGVERSION
-	       DB_LOGVERSION_LATCHING DB_LOG_AUTOREMOVE DB_LOG_AUTO_REMOVE
-	       DB_LOG_BUFFER_FULL DB_LOG_CHKPNT DB_LOG_COMMIT DB_LOG_DIRECT
-	       DB_LOG_DISK DB_LOG_DSYNC DB_LOG_INMEMORY DB_LOG_IN_MEMORY
-	       DB_LOG_LOCKED DB_LOG_NOCOPY DB_LOG_NOT_DURABLE DB_LOG_NO_DATA
-	       DB_LOG_PERM DB_LOG_RESEND DB_LOG_SILENT_ERR DB_LOG_VERIFY_BAD
+	       DB_INIT_MUTEX DB_INIT_REP DB_INIT_TXN DB_INORDER
+	       DB_INTERNAL_BLOB_DB DB_INTERNAL_DB DB_INTERNAL_PERSISTENT_DB
+	       DB_INTERNAL_TEMPORARY_DB DB_JAVA_CALLBACK DB_JOINENV
+	       DB_JOIN_ITEM DB_JOIN_NOSORT DB_KEYEMPTY DB_KEYEXIST DB_KEYFIRST
+	       DB_KEYLAST DB_LAST DB_LEGACY DB_LOCAL_SITE DB_LOCKDOWN
+	       DB_LOCKMAGIC DB_LOCKVERSION DB_LOCK_ABORT DB_LOCK_CHECK
+	       DB_LOCK_CONFLICT DB_LOCK_DEADLOCK DB_LOCK_DEFAULT DB_LOCK_EXPIRE
+	       DB_LOCK_FREE_LOCKER DB_LOCK_IGNORE_REC DB_LOCK_MAXLOCKS
+	       DB_LOCK_MAXWRITE DB_LOCK_MINLOCKS DB_LOCK_MINWRITE DB_LOCK_NORUN
+	       DB_LOCK_NOTEXIST DB_LOCK_NOTGRANTED DB_LOCK_NOTHELD
+	       DB_LOCK_NOWAIT DB_LOCK_OLDEST DB_LOCK_RANDOM DB_LOCK_RECORD
+	       DB_LOCK_REMOVE DB_LOCK_RIW_N DB_LOCK_RW_N DB_LOCK_SET_TIMEOUT
+	       DB_LOCK_SWITCH DB_LOCK_UPGRADE DB_LOCK_YOUNGEST DB_LOGCHKSUM
+	       DB_LOGC_BUF_SIZE DB_LOGFILEID_INVALID DB_LOGMAGIC DB_LOGOLDVER
+	       DB_LOGVERSION DB_LOGVERSION_LATCHING DB_LOG_AUTOREMOVE
+	       DB_LOG_AUTO_REMOVE DB_LOG_BLOB DB_LOG_BUFFER_FULL DB_LOG_CHKPNT
+	       DB_LOG_COMMIT DB_LOG_DIRECT DB_LOG_DISK DB_LOG_DSYNC
+	       DB_LOG_INMEMORY DB_LOG_IN_MEMORY DB_LOG_LOCKED DB_LOG_NOCOPY
+	       DB_LOG_NOSYNC DB_LOG_NOT_DURABLE DB_LOG_NO_DATA DB_LOG_PERM
+	       DB_LOG_RESEND DB_LOG_SILENT_ERR DB_LOG_VERIFY_BAD
 	       DB_LOG_VERIFY_CAF DB_LOG_VERIFY_DBFILE DB_LOG_VERIFY_ERR
 	       DB_LOG_VERIFY_FORWARD DB_LOG_VERIFY_INTERR DB_LOG_VERIFY_PARTIAL
 	       DB_LOG_VERIFY_VERBOSE DB_LOG_VERIFY_WARNING DB_LOG_WRNOSYNC
@@ -6861,16 +7075,17 @@ my @names = (qw(DB2_AM_EXCL DB2_AM_INTEXCL DB2_AM_NOWAIT DB_AFTER DB_AGGRESSIVE
 	       DB_MPOOL_NEW_GROUP DB_MPOOL_NOFILE DB_MPOOL_NOLOCK
 	       DB_MPOOL_PRIVATE DB_MPOOL_TRY DB_MPOOL_UNLINK DB_MULTIPLE
 	       DB_MULTIPLE_KEY DB_MULTIVERSION DB_MUTEXDEBUG DB_MUTEXLOCKS
-	       DB_MUTEX_ALLOCATED DB_MUTEX_LOCKED DB_MUTEX_LOGICAL_LOCK
-	       DB_MUTEX_PROCESS_ONLY DB_MUTEX_SELF_BLOCK DB_MUTEX_SHARED
-	       DB_MUTEX_THREAD DB_NEEDSPLIT DB_NEXT DB_NEXT_DUP DB_NEXT_NODUP
-	       DB_NOCOPY DB_NODUPDATA DB_NOERROR DB_NOFLUSH DB_NOLOCKING
-	       DB_NOMMAP DB_NOORDERCHK DB_NOOVERWRITE DB_NOPANIC DB_NORECURSE
-	       DB_NOSERVER DB_NOSERVER_HOME DB_NOSERVER_ID DB_NOSYNC
-	       DB_NOTFOUND DB_NO_AUTO_COMMIT DB_NO_CHECKPOINT DB_ODDFILESIZE
-	       DB_OK_BTREE DB_OK_HASH DB_OK_HEAP DB_OK_QUEUE DB_OK_RECNO
-	       DB_OLD_VERSION DB_OPEN_CALLED DB_OPFLAGS_MASK DB_ORDERCHKONLY
-	       DB_OVERWRITE DB_OVERWRITE_DUP DB_PAD DB_PAGEYIELD DB_PAGE_LOCK
+	       DB_MUTEX_ALLOCATED DB_MUTEX_DESCRIBE_STRLEN DB_MUTEX_LOCKED
+	       DB_MUTEX_LOGICAL_LOCK DB_MUTEX_OWNER_DEAD DB_MUTEX_PROCESS_ONLY
+	       DB_MUTEX_SELF_BLOCK DB_MUTEX_SHARED DB_MUTEX_THREAD DB_NEEDSPLIT
+	       DB_NEXT DB_NEXT_DUP DB_NEXT_NODUP DB_NOCOPY DB_NODUPDATA
+	       DB_NOERROR DB_NOFLUSH DB_NOLOCKING DB_NOMMAP DB_NOORDERCHK
+	       DB_NOOVERWRITE DB_NOPANIC DB_NORECURSE DB_NOSERVER
+	       DB_NOSERVER_HOME DB_NOSERVER_ID DB_NOSYNC DB_NOTFOUND
+	       DB_NO_AUTO_COMMIT DB_NO_CHECKPOINT DB_ODDFILESIZE DB_OK_BTREE
+	       DB_OK_HASH DB_OK_HEAP DB_OK_QUEUE DB_OK_RECNO DB_OLD_VERSION
+	       DB_OPEN_CALLED DB_OPFLAGS_MASK DB_ORDERCHKONLY DB_OVERWRITE
+	       DB_OVERWRITE_DUP DB_PAD DB_PAGEYIELD DB_PAGE_LOCK
 	       DB_PAGE_NOTFOUND DB_PANIC_ENVIRONMENT DB_PERMANENT DB_POSITION
 	       DB_POSITIONI DB_PREV DB_PREV_DUP DB_PREV_NODUP DB_PRINTABLE
 	       DB_PRIVATE DB_PR_HEADERS DB_PR_PAGE DB_PR_RECOVERYTEST
@@ -6883,15 +7098,17 @@ my @names = (qw(DB2_AM_EXCL DB2_AM_INTEXCL DB2_AM_NOWAIT DB_AFTER DB_AGGRESSIVE
 	       DB_REPMGR_ACKS_ALL_PEERS DB_REPMGR_ACKS_NONE DB_REPMGR_ACKS_ONE
 	       DB_REPMGR_ACKS_ONE_PEER DB_REPMGR_ACKS_QUORUM
 	       DB_REPMGR_CONF_2SITE_STRICT DB_REPMGR_CONF_ELECTIONS
+	       DB_REPMGR_CONF_PREFMAS_CLIENT DB_REPMGR_CONF_PREFMAS_MASTER
 	       DB_REPMGR_CONNECTED DB_REPMGR_DISCONNECTED DB_REPMGR_ISPEER
-	       DB_REPMGR_NEED_RESPONSE DB_REPMGR_PEER DB_REP_ACK_TIMEOUT
-	       DB_REP_ANYWHERE DB_REP_BULKOVF DB_REP_CHECKPOINT_DELAY
-	       DB_REP_CLIENT DB_REP_CONF_AUTOINIT DB_REP_CONF_AUTOROLLBACK
-	       DB_REP_CONF_BULK DB_REP_CONF_DELAYCLIENT DB_REP_CONF_INMEM
-	       DB_REP_CONF_LEASE DB_REP_CONF_NOAUTOINIT DB_REP_CONF_NOWAIT
-	       DB_REP_CONNECTION_RETRY DB_REP_CREATE DB_REP_DEFAULT_PRIORITY
-	       DB_REP_DUPMASTER DB_REP_EGENCHG DB_REP_ELECTION
-	       DB_REP_ELECTION_RETRY DB_REP_ELECTION_TIMEOUT
+	       DB_REPMGR_ISVIEW DB_REPMGR_NEED_RESPONSE DB_REPMGR_PEER
+	       DB_REP_ACK_TIMEOUT DB_REP_ANYWHERE DB_REP_BULKOVF
+	       DB_REP_CHECKPOINT_DELAY DB_REP_CLIENT DB_REP_CONF_AUTOINIT
+	       DB_REP_CONF_AUTOROLLBACK DB_REP_CONF_BULK
+	       DB_REP_CONF_DELAYCLIENT DB_REP_CONF_ELECT_LOGLENGTH
+	       DB_REP_CONF_INMEM DB_REP_CONF_LEASE DB_REP_CONF_NOAUTOINIT
+	       DB_REP_CONF_NOWAIT DB_REP_CONNECTION_RETRY DB_REP_CREATE
+	       DB_REP_DEFAULT_PRIORITY DB_REP_DUPMASTER DB_REP_EGENCHG
+	       DB_REP_ELECTION DB_REP_ELECTION_RETRY DB_REP_ELECTION_TIMEOUT
 	       DB_REP_FULL_ELECTION DB_REP_FULL_ELECTION_TIMEOUT
 	       DB_REP_HANDLE_DEAD DB_REP_HEARTBEAT_MONITOR
 	       DB_REP_HEARTBEAT_SEND DB_REP_HOLDELECTION DB_REP_IGNORE
@@ -6906,13 +7123,14 @@ my @names = (qw(DB2_AM_EXCL DB2_AM_INTEXCL DB2_AM_NOWAIT DB_AFTER DB_AGGRESSIVE
 	       DB_SA_UNKNOWNKEY DB_SECONDARY_BAD DB_SEQUENCE_OLDVER
 	       DB_SEQUENCE_VERSION DB_SEQUENTIAL DB_SEQ_DEC DB_SEQ_INC
 	       DB_SEQ_RANGE_SET DB_SEQ_WRAP DB_SEQ_WRAPPED DB_SET
-	       DB_SET_LOCK_TIMEOUT DB_SET_LTE DB_SET_RANGE DB_SET_RECNO
-	       DB_SET_REG_TIMEOUT DB_SET_TXN_NOW DB_SET_TXN_TIMEOUT
-	       DB_SHALLOW_DUP DB_SNAPSHOT DB_SPARE_FLAG DB_STAT_ALL
-	       DB_STAT_ALLOC DB_STAT_CLEAR DB_STAT_LOCK_CONF
+	       DB_SET_LOCK_TIMEOUT DB_SET_LTE DB_SET_MUTEX_FAILCHK_TIMEOUT
+	       DB_SET_RANGE DB_SET_RECNO DB_SET_REG_TIMEOUT DB_SET_TXN_NOW
+	       DB_SET_TXN_TIMEOUT DB_SHALLOW_DUP DB_SNAPSHOT DB_SPARE_FLAG
+	       DB_STAT_ALL DB_STAT_ALLOC DB_STAT_CLEAR DB_STAT_LOCK_CONF
 	       DB_STAT_LOCK_LOCKERS DB_STAT_LOCK_OBJECTS DB_STAT_LOCK_PARAMS
 	       DB_STAT_MEMP_HASH DB_STAT_MEMP_NOERROR DB_STAT_NOERROR
-	       DB_STAT_SUBSYSTEM DB_STAT_SUMMARY DB_ST_DUPOK DB_ST_DUPSET
+	       DB_STAT_SUBSYSTEM DB_STAT_SUMMARY DB_STREAM_READ
+	       DB_STREAM_SYNC_WRITE DB_STREAM_WRITE DB_ST_DUPOK DB_ST_DUPSET
 	       DB_ST_DUPSORT DB_ST_IS_RECNO DB_ST_OVFL_LEAF DB_ST_RECNUM
 	       DB_ST_RELEN DB_ST_TOPLEVEL DB_SURPRISE_KID DB_SWAPBYTES
 	       DB_SYSTEM_MEM DB_TEMPORARY DB_TEST_ELECTINIT DB_TEST_ELECTSEND
@@ -6932,21 +7150,21 @@ my @names = (qw(DB2_AM_EXCL DB2_AM_INTEXCL DB2_AM_NOWAIT DB_AFTER DB_AGGRESSIVE
 	       DB_UPGRADE DB_USERCOPY_GETDATA DB_USERCOPY_SETDATA
 	       DB_USE_ENVIRON DB_USE_ENVIRON_ROOT DB_VERB_BACKUP
 	       DB_VERB_CHKPOINT DB_VERB_DEADLOCK DB_VERB_FILEOPS
-	       DB_VERB_FILEOPS_ALL DB_VERB_RECOVERY DB_VERB_REGISTER
-	       DB_VERB_REPLICATION DB_VERB_REPMGR_CONNFAIL DB_VERB_REPMGR_MISC
-	       DB_VERB_REP_ELECT DB_VERB_REP_LEASE DB_VERB_REP_MISC
-	       DB_VERB_REP_MSGS DB_VERB_REP_SYNC DB_VERB_REP_SYSTEM
-	       DB_VERB_REP_TEST DB_VERB_WAITSFOR DB_VERIFY DB_VERIFY_BAD
-	       DB_VERIFY_FATAL DB_VERIFY_PARTITION DB_VERSION_FAMILY
-	       DB_VERSION_MAJOR DB_VERSION_MINOR DB_VERSION_MISMATCH
-	       DB_VERSION_PATCH DB_VERSION_RELEASE DB_VRFY_FLAGMASK
-	       DB_WRITECURSOR DB_WRITELOCK DB_WRITEOPEN DB_WRNOSYNC
-	       DB_XA_CREATE DB_XIDDATASIZE DB_YIELDCPU DB_debug_FLAG
-	       DB_user_BEGIN),
-            {name=>"DB_BACKUP_READ_COUNT", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \\\n     DB_VERSION_PATCH >= 5)\n", "#endif\n"]},
-            {name=>"DB_BACKUP_READ_SLEEP", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \\\n     DB_VERSION_PATCH >= 5)\n", "#endif\n"]},
-            {name=>"DB_BACKUP_SIZE", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \\\n     DB_VERSION_PATCH >= 5)\n", "#endif\n"]},
-            {name=>"DB_BACKUP_WRITE_DIRECT", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \\\n     DB_VERSION_PATCH >= 5)\n", "#endif\n"]},
+	       DB_VERB_FILEOPS_ALL DB_VERB_MVCC DB_VERB_RECOVERY
+	       DB_VERB_REGISTER DB_VERB_REPLICATION DB_VERB_REPMGR_CONNFAIL
+	       DB_VERB_REPMGR_MISC DB_VERB_REP_ELECT DB_VERB_REP_LEASE
+	       DB_VERB_REP_MISC DB_VERB_REP_MSGS DB_VERB_REP_SYNC
+	       DB_VERB_REP_SYSTEM DB_VERB_REP_TEST DB_VERB_WAITSFOR DB_VERIFY
+	       DB_VERIFY_BAD DB_VERIFY_FATAL DB_VERIFY_PARTITION
+	       DB_VERSION_FAMILY DB_VERSION_MAJOR DB_VERSION_MINOR
+	       DB_VERSION_MISMATCH DB_VERSION_PATCH DB_VERSION_RELEASE
+	       DB_VRFY_FLAGMASK DB_WRITECURSOR DB_WRITELOCK DB_WRITEOPEN
+	       DB_WRNOSYNC DB_XA_CREATE DB_XIDDATASIZE DB_YIELDCPU
+	       DB_debug_FLAG DB_user_BEGIN),
+            {name=>"DB_BACKUP_READ_COUNT", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \\\n     DB_VERSION_PATCH >= 15)\n", "#endif\n"]},
+            {name=>"DB_BACKUP_READ_SLEEP", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \\\n     DB_VERSION_PATCH >= 15)\n", "#endif\n"]},
+            {name=>"DB_BACKUP_SIZE", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \\\n     DB_VERSION_PATCH >= 15)\n", "#endif\n"]},
+            {name=>"DB_BACKUP_WRITE_DIRECT", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 3) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 3 && \\\n     DB_VERSION_PATCH >= 15)\n", "#endif\n"]},
             {name=>"DB_BTREE", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 2) || \\\n    (DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR > 0) || \\\n    (DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR == 0 && \\\n     DB_VERSION_PATCH >= 3)\n", "#endif\n"]},
             {name=>"DB_HASH", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 2) || \\\n    (DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR > 0) || \\\n    (DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR == 0 && \\\n     DB_VERSION_PATCH >= 3)\n", "#endif\n"]},
             {name=>"DB_HEAP", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 2) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 2 && \\\n     DB_VERSION_PATCH >= 14)\n", "#endif\n"]},
@@ -6994,6 +7212,7 @@ my @names = (qw(DB2_AM_EXCL DB2_AM_INTEXCL DB2_AM_NOWAIT DB_AFTER DB_AGGRESSIVE
             {name=>"LOGREC_Done", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 0) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 0 && \\\n     DB_VERSION_PATCH >= 6)\n", "#endif\n"]},
             {name=>"LOGREC_HDR", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 0) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 0 && \\\n     DB_VERSION_PATCH >= 6)\n", "#endif\n"]},
             {name=>"LOGREC_LOCKS", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 0) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 0 && \\\n     DB_VERSION_PATCH >= 6)\n", "#endif\n"]},
+            {name=>"LOGREC_LONGARG", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 6) || \\\n    (DB_VERSION_MAJOR == 6 && DB_VERSION_MINOR > 0) || \\\n    (DB_VERSION_MAJOR == 6 && DB_VERSION_MINOR == 0 && \\\n     DB_VERSION_PATCH >= 30)\n", "#endif\n"]},
             {name=>"LOGREC_OP", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 0) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 0 && \\\n     DB_VERSION_PATCH >= 6)\n", "#endif\n"]},
             {name=>"LOGREC_PGDBT", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 0) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 0 && \\\n     DB_VERSION_PATCH >= 6)\n", "#endif\n"]},
             {name=>"LOGREC_PGDDBT", type=>"IV", macro=>["#if (DB_VERSION_MAJOR > 5) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR > 0) || \\\n    (DB_VERSION_MAJOR == 5 && DB_VERSION_MINOR == 0 && \\\n     DB_VERSION_PATCH >= 6)\n", "#endif\n"]},
@@ -7077,6 +7296,35 @@ __END__
   case 28:
     return constant_28 (aTHX_ name, iv_return);
     break;
+  case 29:
+    /* Names all of length 29.  */
+    /* DB_REPMGR_CONF_PREFMAS_CLIENT DB_REPMGR_CONF_PREFMAS_MASTER */
+    /* Offset 28 gives the best switch position.  */
+    switch (name[28]) {
+    case 'R':
+      if (memEQ(name, "DB_REPMGR_CONF_PREFMAS_MASTE", 28)) {
+      /*                                           R      */
+#ifdef DB_REPMGR_CONF_PREFMAS_MASTER
+        *iv_return = DB_REPMGR_CONF_PREFMAS_MASTER;
+        return PERL_constant_ISIV;
+#else
+        return PERL_constant_NOTDEF;
+#endif
+      }
+      break;
+    case 'T':
+      if (memEQ(name, "DB_REPMGR_CONF_PREFMAS_CLIEN", 28)) {
+      /*                                           T      */
+#ifdef DB_REPMGR_CONF_PREFMAS_CLIENT
+        *iv_return = DB_REPMGR_CONF_PREFMAS_CLIENT;
+        return PERL_constant_ISIV;
+#else
+        return PERL_constant_NOTDEF;
+#endif
+      }
+      break;
+    }
+    break;
   case 31:
     /* Names all of length 31.  */
     /* DB_EVENT_REP_CONNECT_TRY_FAILED DB_EVENT_REP_LOCAL_SITE_REMOVED */
@@ -7106,6 +7354,16 @@ __END__
       break;
     }
     break;
+  case 32:
+    if (memEQ(name, "DB_EVENT_REP_AUTOTAKEOVER_FAILED", 32)) {
+#ifdef DB_EVENT_REP_AUTOTAKEOVER_FAILED
+      *iv_return = DB_EVENT_REP_AUTOTAKEOVER_FAILED;
+      return PERL_constant_ISIV;
+#else
+      return PERL_constant_NOTDEF;
+#endif
+    }
+    break;
   }
   return PERL_constant_NOTFOUND;
 }
diff --git a/lang/perl/BerkeleyDB/mkconsts.pl b/lang/perl/BerkeleyDB/mkconsts.pl
index 8d3c5087..bc5828eb 100644
--- a/lang/perl/BerkeleyDB/mkconsts.pl
+++ b/lang/perl/BerkeleyDB/mkconsts.pl
@@ -1035,7 +1035,7 @@ use constant IGNORE => 'ignore' ;
 	DB_MEM_THREAD              => '5.2.14',
 
 	#########
-	# 5.3.5
+	# 5.3.15
 	#########
 
 	DB2_AM_EXCL                => DEFINE,
@@ -1047,16 +1047,59 @@ use constant IGNORE => 'ignore' ;
 	DB_BACKUP_NO_LOGS          => DEFINE,
 	DB_BACKUP_SINGLE_DIR       => DEFINE,
 	DB_BACKUP_UPDATE           => DEFINE,
+	DB_CHKSUM_FAIL             => DEFINE,
 	DB_INTERNAL_PERSISTENT_DB  => DEFINE,
 	DB_INTERNAL_TEMPORARY_DB   => DEFINE,
 	DB_LOCK_IGNORE_REC         => DEFINE,
 	DB_VERB_BACKUP             => DEFINE,
+	MP_FOR_FLUSH               => IGNORE,
 
 	# enum DB_BACKUP_CONFIG
-	DB_BACKUP_READ_COUNT       => '5.3.5',
-	DB_BACKUP_READ_SLEEP       => '5.3.5',
-	DB_BACKUP_SIZE             => '5.3.5',
-	DB_BACKUP_WRITE_DIRECT     => '5.3.5',
+	DB_BACKUP_READ_COUNT       => '5.3.15',
+	DB_BACKUP_READ_SLEEP       => '5.3.15',
+	DB_BACKUP_SIZE             => '5.3.15',
+	DB_BACKUP_WRITE_DIRECT     => '5.3.15',
+
+	#########
+	# 6.0.19
+	#########
+
+	DB_DBT_BLOB                => IGNORE,
+	DB_DBT_BLOB_REC            => IGNORE,
+	DB_EVENT_REP_AUTOTAKEOVER_FAILED => DEFINE,
+	DB_INTERNAL_BLOB_DB        => DEFINE,
+	DB_LOG_BLOB                => DEFINE,
+	DB_REPMGR_ISVIEW           => DEFINE,
+	DB_STREAM_READ             => DEFINE,
+	DB_STREAM_SYNC_WRITE       => DEFINE,
+	DB_STREAM_WRITE            => DEFINE,
+	DB_VERB_MVCC               => DEFINE,
+
+	#########
+	# 6.0.30
+	#########
+
+
+	# enum log_rec_type_t
+	LOGREC_LONGARG             => '6.0.30',
+
+	#########
+	# 6.1.10
+	#########
+
+	DB_EVENT_FAILCHK_PANIC     => DEFINE,
+	DB_EVENT_MUTEX_DIED        => DEFINE,
+	DB_EVENT_REP_INQUEUE_FULL  => DEFINE,
+	DB_EXIT_FAILCHK            => DEFINE,
+	DB_EXIT_FILE_EXISTS        => DEFINE,
+	DB_FAILURE_SYMPTOM_SIZE    => DEFINE,
+	DB_LOG_NOSYNC              => DEFINE,
+	DB_MUTEX_DESCRIBE_STRLEN   => DEFINE,
+	DB_MUTEX_OWNER_DEAD        => DEFINE,
+	DB_REPMGR_CONF_PREFMAS_CLIENT => DEFINE,
+	DB_REPMGR_CONF_PREFMAS_MASTER => DEFINE,
+	DB_REP_CONF_ELECT_LOGLENGTH => DEFINE,
+	DB_SET_MUTEX_FAILCHK_TIMEOUT => DEFINE,
 	) ;
 
 sub enum_Macro
diff --git a/lang/perl/BerkeleyDB/scan.pl b/lang/perl/BerkeleyDB/scan.pl
index 3fce7a8d..ed0282b3 100644
--- a/lang/perl/BerkeleyDB/scan.pl
+++ b/lang/perl/BerkeleyDB/scan.pl
@@ -102,8 +102,8 @@ sub scan
     foreach $define (sort keys %seen_define)
     { 
         my $out = $filler ;
-	substr($out,0, length $define) = $define;
-	$result .= "\t$out => $seen_define{$define},\n" ;
+        substr($out,0, length $define) = $define;
+        $result .= "\t$out => $seen_define{$define},\n" ;
     }
     
     while ($file =~ /\btypedef\s+enum\s*{(.*?)}\s*(\w+)/gs )
@@ -120,8 +120,9 @@ sub scan
     
         my @tokens = map { s/\s*=.*// ; $_} split /\s*,\s*/, $enum ;
         my @new =  grep { ! $Enums{$_}++ } @tokens ;
-	if (@new)
-	{
+
+        if (@new)
+        {
             my $value ;
             if ($ignore)
               { $value = "IGNORE, # $version" }
@@ -130,14 +131,14 @@ sub scan
 
             $result .= "\n\t# enum $name\n";
             my $out = $filler ;
-	    foreach $name (@new)
-	    {
+            foreach $name (@new)
+            {
                 next if $ignore_exact_enum{$name} ;
-	        $out = $filler ;
-	        substr($out,0, length $name) = $name;
+                $out = $filler ;
+                substr($out,0, length $name) = $name;
                 $result .= "\t$out => $value\n" ;
-	    }
-	}
+            }
+        }
     }
 
     return $result ;
diff --git a/lang/perl/BerkeleyDB/t/blob.t b/lang/perl/BerkeleyDB/t/blob.t
new file mode 100644
index 00000000..6931418a
--- /dev/null
+++ b/lang/perl/BerkeleyDB/t/blob.t
@@ -0,0 +1,166 @@
+#!./perl -w
+
+use strict ;
+
+use lib 't';
+use BerkeleyDB; 
+use util ;
+use Test::More;
+
+plan(skip_all => "this needs Berkeley DB 6.x.x or better\n" )
+    if $BerkeleyDB::db_version < 6;
+
+plan tests => 84;
+
+my $Dfile = "dbhash.tmp";
+my $Dfile2 = "dbhash2.tmp";
+my $Dfile3 = "dbhash3.tmp";
+unlink $Dfile;
+
+umask(0) ;
+
+sub isBlob
+{
+    my $cursor = shift ;
+    my $key = shift;
+
+    my $v = '';
+    $cursor->partial_set(0,0) ;
+    $cursor->c_get($key, $v, DB_SET) ;
+    $cursor->partial_clear() ;
+    return defined $cursor->db_stream(DB_STREAM_WRITE);
+}
+
+for my $TYPE ( qw(BerkeleyDB::Hash BerkeleyDB::Btree ))
+{
+    #diag "Test $TYPE";
+    my $lex = new LexFile $Dfile ;
+    my $home = "./fred" ;
+    my $lexd = new LexDir $home ;
+    my $threshold = 1234 ;
+
+    ok my $env = new BerkeleyDB::Env 
+                        Flags => DB_CREATE|DB_INIT_MPOOL,
+                        #@StdErrFile, 
+                        BlobDir => $home,
+                        Home => $home ;
+
+    ok my $db = new $TYPE Filename => $Dfile, 
+				    Env      => $env,
+                    BlobThreshold => $threshold,
+				    Flags    => DB_CREATE ;
+
+    isa_ok $db, $TYPE ;
+
+    ok $env->get_blob_threshold(my $t1) == 0 ;
+    is $t1, 0," env threshold is 0" ;
+
+    ok $env->get_blob_dir(my $dir1) == 0 ;
+    is $dir1, $home," env threshold is 0" ;
+
+    ok $db->get_blob_threshold(my $t2) == 0 ;
+    is $t2, $threshold," db threshold is $threshold" ;
+
+    ok $db->get_blob_dir(my $dir2) == 0 ;
+    is $dir2, $home, " env threshold is 0" ;
+
+    my $smallData = "a234";
+    my $bigData = "x" x ($threshold+1) ;
+    ok $db->db_put("1", $bigData) == 0  ;
+    ok $db->db_put("2", $smallData) == 0  ;
+
+    my $v2 ;
+    ok $db->db_get("1", $v2) == 0 ;
+    is $v2, $bigData;
+
+    my $v1 ;
+    ok $db->db_get("2", $v1) == 0 ;
+    is $v1, $smallData;
+
+    ok my $cursor = $db->db_cursor() ;
+
+    ok isBlob($cursor, "1");
+    ok !isBlob($cursor, "2");
+
+    my $k = "1";
+    my $v = '';
+    $cursor->partial_set(0,0) ;
+    ok $cursor->c_get($k, $v, DB_SET) == 0, "set cursor"
+        or diag "Status is [" . $cursor->status() . "]";
+    $cursor->partial_clear() ;
+    is $k, "1";
+    ok my $dbstream = $cursor->db_stream(DB_STREAM_WRITE)
+        or diag "Status is [" . $cursor->status() . "]";
+    isa_ok $dbstream, 'BerkeleyDB::DbStream';
+    ok $dbstream->size(my $s) == 0 , "size";
+    is $s, length $bigData, "length ok";
+    my $new ;
+    ok $dbstream->read($new, 0, length $bigData) == 0 , "read"
+        or diag "Status is [" . $cursor->status() . "]";
+    is $new, $bigData;
+    my $newData = "hello world" ;
+    ok $dbstream->write($newData) == 0 , "write";
+
+    substr($bigData, 0, length($newData)) = $newData;
+    
+    my $new1;
+    ok $dbstream->read($new, 0, 5) == 0 , "read";
+    is $new, "hello";
+
+    ok $dbstream->close() == 0 , "close";
+
+    $k = "1";
+    my $stream = $cursor->c_get_db_stream($k, DB_SET, DB_STREAM_WRITE) ;
+    isa_ok $stream, 'BerkeleyDB::DbStream';
+    is $k, "1";
+    ok $stream->size($s) == 0 , "size";
+    is $s, length $bigData, "length ok";
+    $new = 'abc';
+    ok $stream->read($new, 0, 5) == 0 , "read";
+    is $new, "hello";
+    ok $stream->close() == 0 , "close";
+
+
+    ok my $cursor1 = $db->db_cursor() ;
+    my $d1 ;
+    my $d2 ;
+    while (1)
+    {
+        my $k = '';
+        my $v = '';
+        $cursor->partial_set(0,0) ;
+        my $status = $cursor1->c_get($k, $v, DB_NEXT) ;
+        $cursor->partial_clear();
+
+        last if $status != 0 ;
+
+        my $stream = $cursor1->db_stream(DB_STREAM_WRITE);
+
+        if (defined $stream)
+        {
+            $stream->size(my $s) ;
+            my $d = '';
+            my $delta = 1024;
+            my $off = 0;
+            while ($s)
+            {
+                $delta = $s if $s - $delta < 0 ;
+
+                $stream->read($d, $off, $delta);
+                $off += $delta ;
+                $s -= $delta ;
+                $d1 .= $d ;
+            }
+
+        }
+        else
+        {
+            $cursor1->c_get($k, $d2, DB_CURRENT) ;
+        }
+    }
+
+    is $d1, $bigData;
+    is $d2, $smallData;
+
+}
+
diff --git a/lang/perl/BerkeleyDB/t/btree.t b/lang/perl/BerkeleyDB/t/btree.t
index 44667a56..adef0c45 100644
--- a/lang/perl/BerkeleyDB/t/btree.t
+++ b/lang/perl/BerkeleyDB/t/btree.t
@@ -280,24 +280,9 @@ umask(0) ;
         $k{$_} = 1 ;
     }
 
-    sub ArrayCompare
-    {
-        my($a, $b) = @_ ;
-    
-        return 0 if @$a != @$b ;
-    
-        foreach (1 .. length @$a)
-        {
-            return 0 unless $$a[$_] eq $$b[$_] ;
-        }
-
-        1 ;
-    }
-
-    ok ArrayCompare (\@srt_1, [keys %h]);
-    ok ArrayCompare (\@srt_2, [keys %g]);
-    ok ArrayCompare (\@srt_3, [keys %k]);
-
+    is_deeply [keys %h], \@srt_1 ;
+    is_deeply [keys %g], \@srt_2 ;
+    is_deeply [keys %k], \@srt_3 ;
 }
 
 {
@@ -331,7 +316,7 @@ umask(0) ;
 
     foreach (@Keys) {
         local $^W = 0 ;
-	my $value = shift @Values ;
+        my $value = shift @Values ;
         $h{$_} = $value ; 
         $g{$_} = $value ;
         $k{$_} = $value ;
@@ -339,23 +324,25 @@ umask(0) ;
 
     sub getValues
     {
-         my $hash = shift ;
-	 my $db = tied %$hash ;
-	 my $cursor = $db->db_cursor() ;
-	 my @values = () ;
-	 my ($k, $v) = (0,0) ;
-         while ($cursor->c_get($k, $v, DB_NEXT) == 0) {
-	     push @values, $v ;
-	 }
-	 return @values ;
+        my $hash = shift ;
+        my $db = tied %$hash ;
+        my $cursor = $db->db_cursor() ;
+        my @values = () ;
+        my ($k, $v) = (0,0) ;
+        while ($cursor->c_get($k, $v, DB_NEXT) == 0) {
+            push @values, $v ;
+        }
+        return @values ;
     }
 
-    ok ArrayCompare (\@srt_1, [keys %h]);
-    ok ArrayCompare (\@srt_2, [keys %g]);
-    ok ArrayCompare (\@srt_3, [keys %k]);
-    ok ArrayCompare ([qw(dd 0 0 x 3 1 abc)], [getValues \%h]);
-    ok ArrayCompare ([qw(dd 1 0 3 x abc 0)], [getValues \%g]);
-    ok ArrayCompare ([qw(0 x 3 0 1 dd abc)], [getValues \%k]);
+    is_deeply [keys %h], \@srt_1 ;
+    is_deeply [keys %g], \@srt_2 ;
+    is_deeply [keys %k], \@srt_3 ;
+
+    is_deeply [getValues \%h], [qw(dd 0 0 x 3 1 abc)];
+    is_deeply [getValues \%g], [qw(dd 1 3 0 x abc 0)]
+        or diag "Expected [dd 1 0 3 x abc 0] got [@{ [getValues(\%g)] }]\n";
+    is_deeply [getValues \%k], [qw(0 x 3 0 1 dd abc)];
 
     # test DB_DUP_NEXT
     ok my $cur = (tied %g)->db_cursor() ;
@@ -397,15 +384,15 @@ umask(0) ;
 
     foreach (@Keys) {
         local $^W = 0 ;
-	my $value = shift @Values ;
+        my $value = shift @Values ;
         $h{$_} = $value ; 
         $g{$_} = $value ;
     }
 
-    ok ArrayCompare (\@srt_1, [keys %h]);
-    ok ArrayCompare (\@srt_2, [keys %g]);
-    ok ArrayCompare ([qw(dd 1 3 x 2 11 abc 0)], [getValues \%g]);
-    ok ArrayCompare ([qw(dd 0 11 2 x 3 1 abc)], [getValues \%h]);
+    is_deeply [keys %h], \@srt_1 ;
+    is_deeply [keys %g], \@srt_2 ;
+    is_deeply [getValues \%h], [qw(dd 0 11 2 x 3 1 abc)];
+    is_deeply [getValues \%h], [qw(dd 0 11 2 x 3 1 abc)];
 
 }
 
diff --git a/lang/perl/BerkeleyDB/t/heap.t b/lang/perl/BerkeleyDB/t/heap.t
new file mode 100644
index 00000000..f8a51ae3
--- /dev/null
+++ b/lang/perl/BerkeleyDB/t/heap.t
@@ -0,0 +1,564 @@
+#!./perl -w
+
+use strict ;
+
+use lib 't';
+use BerkeleyDB; 
+use util ;
+use Test::More;
+
+plan(skip_all => "Heap needs Berkeley DB 5.2.x or better\n" )
+    if $BerkeleyDB::db_version < 5.2;
+
+# TODO - fix this
+plan(skip_all => "Heap suport not available\n" )
+    if ! BerkeleyDB::has_heap() ;
+
+plan tests => 68;
+
+my $Dfile = "dbhash.tmp";
+my $Dfile2 = "dbhash2.tmp";
+my $Dfile3 = "dbhash3.tmp";
+unlink $Dfile;
+
+umask(0) ;
+
+
+# Check for invalid parameters
+{
+    # Check for invalid parameters
+    my $db ;
+    eval ' $db = new BerkeleyDB::Heap  -Stupid => 3 ; ' ;
+    ok $@ =~ /unknown key value\(s\) Stupid/  ;
+
+    eval ' $db = new BerkeleyDB::Heap -Bad => 2, -Mode => 0345, -Stupid => 3; ' ;
+    ok $@ =~ /unknown key value\(s\) (Bad,? |Stupid,? ){2}/  
+        or print "# $@" ;
+
+    eval ' $db = new BerkeleyDB::Heap -Env => 2 ' ;
+    ok $@ =~ /^Env not of type BerkeleyDB::Env/ ;
+
+    eval ' $db = new BerkeleyDB::Heap -Txn => "x" ' ;
+    ok $@ =~ /^Txn not of type BerkeleyDB::Txn/ ;
+
+    my $obj = bless [], "main" ;
+    eval ' $db = new BerkeleyDB::Heap -Env => $obj ' ;
+    ok $@ =~ /^Env not of type BerkeleyDB::Env/ ;
+}
+
+{
+    # Tied Hash interface
+
+    my $lex = new LexFile $Dfile ;
+    my %hash ;
+    eval " tie %hash, 'BerkeleyDB::Heap', -Filename => '$Dfile',
+                                      -Flags    => DB_CREATE ; " ;
+    ok $@ =~ /^Tied Hash interface not supported with BerkeleyDB::Heap/;
+
+}
+# Now check the interface to Heap
+
+{
+    my $lex = new LexFile $Dfile ;
+
+    ok my $db = new BerkeleyDB::Heap -Filename => $Dfile, 
+				    -Flags    => DB_CREATE 
+        or diag "Cannot create Heap: [$!][$BerkeleyDB::Error]\n" ;
+
+    # Add a k/v pair
+    my $value ;
+    my $status ;
+    my $key1;
+    my $key2;
+    is $db->Env, undef;
+    ok $db->db_put($key1, "some value", DB_APPEND) == 0  
+        or diag "Cannot db_put: " . $db->status() . "[$!][$BerkeleyDB::Error]\n" ;
+    ok $db->status() == 0 ;
+    ok $db->db_get($key1, $value) == 0 
+        or diag "Cannot db_get: [$!][$BerkeleyDB::Error]\n" ;
+    ok $value eq "some value" ;
+    ok $db->db_put($key2, "value", DB_APPEND) == 0  ;
+    ok $db->db_get($key2, $value) == 0 
+        or diag "Cannot db_get: [$!][$BerkeleyDB::Error]\n" ;
+    ok $value eq "value" ;
+    ok $db->db_del($key1) == 0 ;
+    ok $db->db_get($key1, $value) == DB_NOTFOUND ;
+    ok $db->status() == DB_NOTFOUND ;
+    ok $db->status() =~ $DB_errors{'DB_NOTFOUND'} 
+        or diag "Status is [" . $db->status() . "]";
+
+    ok $db->db_sync() == 0 ;
+
+    # Check NOOVERWRITE will make put fail when attempting to overwrite
+    # an existing record.
+
+    ok $db->db_put( $key2, 'x', DB_NOOVERWRITE) == DB_KEYEXIST ;
+    ok $db->status() =~ $DB_errors{'DB_KEYEXIST'} ;
+    ok $db->status() == DB_KEYEXIST ;
+
+
+    # check that the value of the key  has not been changed by the
+    # previous test
+    ok $db->db_get($key2, $value) == 0 ;
+    ok $value eq "value" ;
+
+    # test DB_GET_BOTH
+    my ($k, $v) = ($key2, "value") ;
+    ok $db->db_get($k, $v, DB_GET_BOTH) == 0 ;
+
+    ($k, $v) = ($key2, "fred") ;
+    ok $db->db_get($k, $v, DB_GET_BOTH) == DB_NOTFOUND ;
+
+    ($k, $v) = ("another", "value") ;
+    ok $db->db_get($k, $v, DB_GET_BOTH) == DB_NOTFOUND ;
+
+
+}
+
+
+{
+    # Check simple env works with a hash.
+    my $lex = new LexFile $Dfile ;
+
+    my $home = "./fred" ;
+    ok my $lexD = new LexDir($home) ;
+
+    ok my $env = new BerkeleyDB::Env -Flags => DB_CREATE|DB_INIT_MPOOL,
+    					 @StdErrFile, -Home => $home ;
+    ok my $db = new BerkeleyDB::Heap -Filename => $Dfile, 
+				    -Env      => $env,
+				    -Flags    => DB_CREATE ;
+
+    isa_ok $db->Env, 'BerkeleyDB::Env';
+    $db->Env->errPrefix("abc");
+    is $db->Env->errPrefix("abc"), 'abc';
+    # Add a k/v pair
+    my $key ;
+    my $value ;
+    ok $db->db_put($key, "some value", DB_APPEND) == 0 ;
+    ok $db->db_get($key, $value) == 0 ;
+    ok $value eq "some value" ;
+    undef $db ;
+    undef $env ;
+}
+
+ 
+{
+    # cursors
+
+    my $lex = new LexFile $Dfile ;
+    my %hash ;
+    my ($k, $v) ;
+    ok my $db = new BerkeleyDB::Heap -Filename => $Dfile, 
+				     -Flags    => DB_CREATE ;
+    #print "[$db] [$!] $BerkeleyDB::Error\n" ;				     
+
+    # create some data
+    my %data =  ();
+    my %keys =  ();
+
+    my $ret = 0 ;
+    for my $v (qw(2 house sea)){
+        my $key;
+        $ret += $db->db_put($key, $v, DB_APPEND) ;
+        $data{$key} = $v;
+        $keys{$v} = $key;
+    }
+
+    ok $ret == 0 ;
+
+    # create the cursor
+    ok my $cursor = $db->db_cursor() ;
+
+    $k = $v = "" ;
+    my %copy = %data ;
+    my $extras = 0 ;
+    # sequence forwards
+    while ($cursor->c_get($k, $v, DB_NEXT) == 0) {
+        if ( $copy{$k} eq $v ) 
+            { delete $copy{$k} }
+	else
+	    { ++ $extras }
+    }
+    ok $cursor->status() == DB_NOTFOUND ;
+    ok $cursor->status() =~ $DB_errors{'DB_NOTFOUND'};
+    ok keys %copy == 0 ;
+    ok $extras == 0 ;
+
+    # sequence backwards
+    %copy = %data ;
+    $extras = 0 ;
+    my $status ;
+    for ( $status = $cursor->c_get($k, $v, DB_LAST) ;
+	  $status == 0 ;
+    	  $status = $cursor->c_get($k, $v, DB_PREV)) {
+        if ( $copy{$k} eq $v ) 
+            { delete $copy{$k} }
+	else
+	    { ++ $extras }
+    }
+    ok $status == DB_NOTFOUND ;
+    ok $status =~ $DB_errors{'DB_NOTFOUND'};
+    ok $cursor->status() == $status ;
+    ok $cursor->status() eq $status ;
+    ok keys %copy == 0 ;
+    ok $extras == 0, "extras == 0" ;
+
+    ($k, $v) = ($keys{"house"}, "house") ;
+    ok $cursor->c_get($k, $v, DB_GET_BOTH) == 0, "c_get BOTH" ;
+
+    ($k, $v) = ($keys{"house"}, "door") ;
+    ok $cursor->c_get($k, $v, DB_GET_BOTH) == DB_NOTFOUND, "DB_NOTFOUND" ;
+
+    ($k, $v) = ("black", "house") ;
+    ok $cursor->c_get($k, $v, DB_GET_BOTH) == DB_NOTFOUND, "DB_NOTFOUND" ;
+
+}
+ 
+
+
+
+{
+    # in-memory file
+
+    my $lex = new LexFile $Dfile ;
+    my %hash ;
+    my $fd ;
+    my $value ;
+    #ok my $db = tie %hash, 'BerkeleyDB::Heap' ;
+    my $db = new BerkeleyDB::Heap 
+				     -Flags    => DB_CREATE ;
+
+    isa_ok $db, 'BerkeleyDB::Heap' ;
+    my $key;
+    ok $db->db_put($key, "some value", DB_APPEND) == 0  ;
+    ok $db->db_get($key, $value) == 0 ;
+    ok $value eq "some value", "some value" ;
+
+}
+ 
+if (0)
+{
+    # partial
+    # check works via API
+
+    my $lex = new LexFile $Dfile ;
+    my $value ;
+    ok my $db = new BerkeleyDB::Heap -Filename => $Dfile,
+                                     -Flags    => DB_CREATE ;
+
+    # create some data
+    my $red;
+    my $green;
+    my $blue;
+    my %data =  (
+		"red"	=> "boat",
+		"green"	=> "house",
+		"blue"	=> "sea",
+		) ;
+
+    my %keys =  (
+		"red" => \$red,
+		"green" => \$green,
+		"blue" => \$blue,
+		) ;
+
+    my $ret = 0 ;
+    while (my ($k, $v) = each %data) {
+        my $key;
+        $ret += $db->db_put($key, $v, DB_APPEND) ;
+        ${ $keys{$k} } = $key;
+    }
+    ok $ret == 0, "ret 0" ;
+
+
+    # do a partial get
+    my ($pon, $off, $len) = $db->partial_set(0,2) ;
+    ok ! $pon && $off == 0 && $len == 0 ;
+    ok $db->db_get($red, $value) == 0 && $value eq "bo" ;
+    ok $db->db_get($green, $value) == 0 && $value eq "ho" ;
+    ok $db->db_get($blue, $value) == 0 && $value eq "se" ;
+
+    # do a partial get, off end of data
+    ($pon, $off, $len) = $db->partial_set(3,2) ;
+    ok $pon ;
+    ok $off == 0 ;
+    ok $len == 2, "len 2" ;
+    ok $db->db_get($red, $value) == 0 && $value eq "t" ;
+    ok $db->db_get($green, $value) == 0 && $value eq "se" ;
+    ok $db->db_get($blue, $value) == 0 && $value eq "" ;
+
+    # switch of partial mode
+    ($pon, $off, $len) = $db->partial_clear() ;
+    ok $pon ;
+    ok $off == 3, "off 3" ;
+    ok $len == 2 ;
+    ok $db->db_get($red, $value) == 0 && $value eq "boat" ;
+    ok $db->db_get($green, $value) == 0 && $value eq "house" ;
+    ok $db->db_get($blue, $value) == 0 && $value eq "sea" ;
+
+    # now partial put
+    my $new;
+    $db->partial_set(0,2) ;
+    ok $db->db_put($red, "") == 0 ;
+    ok $db->db_put($green, "AB") == 0 ;
+    ok $db->db_put($blue, "XYZ") == 0 ;
+    ok $db->db_put($new, "KLM", DB_APPEND) == 0 ;
+
+    ($pon, $off, $len) = $db->partial_clear() ;
+    ok $pon ;
+    ok $off == 0 ;
+    ok $len == 2, "len 2" ;
+    ok $db->db_get($red, $value) == 0 && $value eq "at" ;
+    ok $db->db_get($green, $value) == 0 && $value eq "ABuse" ;
+    ok $db->db_get($blue, $value) == 0 && $value eq "XYZa" ;
+    ok $db->db_get($new, $value) == 0 && $value eq "KLM" ;
+
+    # now partial put
+    ($pon, $off, $len) = $db->partial_set(3,2) ;
+    ok ! $pon ;
+    ok $off == 0 ;
+    ok $len == 0 ;
+    ok $db->db_put($red, "PPP") == 0 ;
+    ok $db->db_put($green, "Q") == 0, "Q" ;
+    ok $db->db_put($blue, "XYZ") == 0, "XYZ" ; # <<<<<<<<<<<<<<
+    ok $db->db_put($new, "TU") == 0 ;
+
+    $db->partial_clear() ;
+    ok $db->db_get($red, $value) == 0 && $value eq "at\0PPP" ;
+    ok $db->db_get($green, $value) == 0 && $value eq "ABuQ" ;
+    ok $db->db_get($blue, $value) == 0 && $value eq "XYZXYZ" ;
+    ok $db->db_get($new, $value) == 0 && $value eq "KLMTU", "KLMTU" ;
+}
+
+
+{
+    # transaction
+
+    my $lex = new LexFile $Dfile ;
+    my %hash ;
+    my $value ;
+
+    my $home = "./fred" ;
+    ok my $lexD = new LexDir($home) ;
+    ok my $env = new BerkeleyDB::Env -Home => $home, @StdErrFile,
+				     -Flags => DB_CREATE|DB_INIT_TXN|
+					  	DB_INIT_MPOOL|DB_INIT_LOCK ;
+    ok my $txn = $env->txn_begin() ;
+    ok my $db1 = new BerkeleyDB::Heap -Filename => $Dfile,
+                                      	       -Flags    =>  DB_CREATE ,
+					       -Env 	 => $env,
+					       -Txn	 => $txn ;
+
+    ok ((my $Z = $txn->txn_commit()) == 0) ;
+    ok $txn = $env->txn_begin() ;
+    $db1->Txn($txn);
+    
+    # create some data
+    my %data =  (
+		"red"	=> "boat",
+		"green"	=> "house",
+		"blue"	=> "sea",
+		) ;
+
+    my $ret = 0 ;
+    while (my ($k, $v) = each %data) {
+        my $key;
+        $ret += $db1->db_put($key, $v, DB_APPEND) ;
+    }
+    ok $ret == 0 ;
+
+    # should be able to see all the records
+
+    ok my $cursor = $db1->db_cursor() ;
+    my ($k, $v) = ("", "") ;
+    my $count = 0 ;
+    # sequence forwards
+    while ($cursor->c_get($k, $v, DB_NEXT) == 0) {
+        ++ $count ;
+    }
+    ok $count == 3 ;
+    undef $cursor ;
+
+    # now abort the transaction
+    #ok $txn->txn_abort() == 0 ;
+    ok (($Z = $txn->txn_abort()) == 0) ;
+
+    # there shouldn't be any records in the database
+    $count = 0 ;
+    # sequence forwards
+    ok $cursor = $db1->db_cursor() ;
+    while ($cursor->c_get($k, $v, DB_NEXT) == 0) {
+        ++ $count ;
+    }
+    ok $count == 0 ;
+
+    undef $txn ;
+    undef $cursor ;
+    undef $db1 ;
+    undef $env ;
+    untie %hash ;
+}
+exit;
+
+{
+    # DB_DUP
+
+    my $lex = new LexFile $Dfile ;
+    my %hash ;
+    ok my $db = tie %hash, 'BerkeleyDB::Heap', -Filename => $Dfile,
+				      -Property  => DB_DUP,
+                                      -Flags    => DB_CREATE ;
+
+    $hash{'Wall'} = 'Larry' ;
+    $hash{'Wall'} = 'Stone' ;
+    $hash{'Smith'} = 'John' ;
+    $hash{'Wall'} = 'Brick' ;
+    $hash{'Wall'} = 'Brick' ;
+    $hash{'mouse'} = 'mickey' ;
+
+    ok keys %hash == 6 ;
+
+    # create a cursor
+    ok my $cursor = $db->db_cursor() ;
+
+    my $key = "Wall" ;
+    my $value ;
+    ok $cursor->c_get($key, $value, DB_SET) == 0 ;
+    ok $key eq "Wall" && $value eq "Larry" ;
+    ok $cursor->c_get($key, $value, DB_NEXT) == 0 ;
+    ok $key eq "Wall" && $value eq "Stone" ;
+    ok $cursor->c_get($key, $value, DB_NEXT) == 0 ;
+    ok $key eq "Wall" && $value eq "Brick" ;
+    ok $cursor->c_get($key, $value, DB_NEXT) == 0 ;
+    ok $key eq "Wall" && $value eq "Brick" ;
+
+    #my $ref = $db->db_stat() ; 
+    #ok ($ref->{bt_flags} | DB_DUP) == DB_DUP ;
+#print "bt_flags " . $ref->{bt_flags} . " DB_DUP " . DB_DUP ."\n";
+
+    undef $db ;
+    undef $cursor ;
+    untie %hash ;
+
+}
+
+{
+    # db_stat
+
+    my $lex = new LexFile $Dfile ;
+    my $recs = ($BerkeleyDB::db_version >= 3.1 ? "bt_ndata" : "bt_nrecs") ;
+    my %hash ;
+    my ($k, $v) ;
+    ok my $db = new BerkeleyDB::Heap -Filename => $Dfile, 
+				     -Flags    => DB_CREATE,
+				 	-Minkey	=>3 ,
+					-Pagesize	=> 2 **12 
+					;
+
+    my $ref = $db->db_stat() ; 
+    ok $ref->{$recs} == 0;
+    ok $ref->{'bt_minkey'} == 3;
+    ok $ref->{'bt_pagesize'} == 2 ** 12;
+
+    # create some data
+    my %data =  (
+		"red"	=> 2,
+		"green"	=> "house",
+		"blue"	=> "sea",
+		) ;
+
+    my $ret = 0 ;
+    while (($k, $v) = each %data) {
+        $ret += $db->db_put($k, $v) ;
+    }
+    ok $ret == 0 ;
+
+    $ref = $db->db_stat() ; 
+    ok $ref->{$recs} == 3;
+}
+
+{
+   # sub-class test
+
+   package Another ;
+
+   use strict ;
+
+   open(FILE, ">SubDB.pm") or die "Cannot open SubDB.pm: $!\n" ;
+   print FILE <<'EOM' ;
+
+   package SubDB ;
+
+   use strict ;
+   use vars qw( @ISA @EXPORT) ;
+
+   require Exporter ;
+   use BerkeleyDB;
+   @ISA=qw(BerkeleyDB BerkeleyDB::Heap );
+   @EXPORT = @BerkeleyDB::EXPORT ;
+
+   sub db_put { 
+	my $self = shift ;
+        my $key = shift ;
+        my $value = shift ;
+        $self->SUPER::db_put($key, $value * 3) ;
+   }
+
+   sub db_get { 
+	my $self = shift ;
+        $self->SUPER::db_get($_[0], $_[1]) ;
+	$_[1] -= 2 ;
+   }
+
+   sub A_new_method
+   {
+	my $self = shift ;
+        my $key = shift ;
+        my $value = $self->FETCH($key) ;
+	return "[[$value]]" ;
+   }
+
+   1 ;
+EOM
+
+    close FILE ;
+
+    use Test::More;
+    BEGIN { push @INC, '.'; }    
+    eval 'use SubDB ; ';
+    ok $@ eq "" ;
+    my %h ;
+    my $X ;
+    eval '
+	$X = tie(%h, "SubDB", -Filename => "dbbtree.tmp", 
+			-Flags => DB_CREATE,
+			-Mode => 0640 );
+	' ;
+
+    ok $@ eq "" && $X ;
+
+    my $ret = eval '$h{"fred"} = 3 ; return $h{"fred"} ' ;
+    ok $@ eq "" ;
+    ok $ret == 7 ;
+
+    my $value = 0;
+    $ret = eval '$X->db_put("joe", 4) ; $X->db_get("joe", $value) ; return $value' ;
+    ok $@ eq "" ;
+    ok $ret == 10 ;
+
+    $ret = eval ' DB_NEXT eq main::DB_NEXT ' ;
+    ok $@ eq ""  ;
+    ok $ret == 1 ;
+
+    $ret = eval '$X->A_new_method("joe") ' ;
+    ok $@ eq "" ;
+    ok $ret eq "[[10]]" ;
+
+    undef $X;
+    untie %h;
+    unlink "SubDB.pm", "dbbtree.tmp" ;
+
+}
+
+
diff --git a/lang/perl/BerkeleyDB/t/queue.t b/lang/perl/BerkeleyDB/t/queue.t
index fd372ae7..a2ffa76f 100644
--- a/lang/perl/BerkeleyDB/t/queue.t
+++ b/lang/perl/BerkeleyDB/t/queue.t
@@ -12,7 +12,7 @@ use util;
 plan(skip_all => "Queue needs Berkeley DB 3.3.x or better\n" )
     if $BerkeleyDB::db_version < 3.3;
     
-plan tests => 257;
+plan tests => 260;
 
 
 my $Dfile = "dbhash.tmp";
@@ -867,6 +867,28 @@ EOM
     undef $db ;
     untie @array ;
 }
+
+{
+    # RT #75691: scalar(@array) returns incorrect value after shift() on tied array
+    my $lex = new LexFile $Dfile ;
+    my @array ;
+    my $db ;
+    $db = tie @array, 'BerkeleyDB::Queue', 
+                        -Flags  => DB_CREATE ,
+				    	-Len       => 2,
+						-Filename => $Dfile ;
+    isa_ok $db, 'BerkeleyDB::Queue';                        
+    $FA ? push @array,  "ab", "cd", "ef", "gh"
+        : $db->push("ab", "cd", "ef", "gh") ;
+    is scalar(@array), 4;
+
+    $FA ? shift @array : $db->shift() ;
+    is scalar(@array), 3;
+
+    undef $db;
+    untie @array ;
+
+}
 __END__
 
 
diff --git a/lang/perl/BerkeleyDB/t/recno.t b/lang/perl/BerkeleyDB/t/recno.t
index fad7829e..1ebe0b40 100644
--- a/lang/perl/BerkeleyDB/t/recno.t
+++ b/lang/perl/BerkeleyDB/t/recno.t
@@ -907,6 +907,32 @@ EOM
     untie @array ;
 
 }
+
+SKIP:
+if(0)
+{
+    # RT #75691: scalar(@array) returns incorrect value after shift() on tied array
+    skip "Test needs Berkeley DB 3.2 or better", 4 
+        if $BerkeleyDB::db_version < 3.3;
+
+    my $lex = new LexFile $Dfile ;
+    my @array ;
+    my $db ;
+    ok $db = tie @array, 'BerkeleyDB::Recno', 
+                        -Flags  => DB_CREATE ,
+						-Filename => $Dfile ;
+
+    isa_ok $db, 'BerkeleyDB::Recno';
+    $FA ? push @array,  7, 9, 11, 13
+        : $db->push(7, 9, 11, 13) ;
+    is scalar(@array), 4;
+    $FA ? shift @array : $db->shift() ;
+    is scalar(@array), 3;
+
+    undef $db;
+    untie @array ;
+
+}
 __END__
 
 
diff --git a/lang/perl/BerkeleyDB/typemap b/lang/perl/BerkeleyDB/typemap
index 088a25fe..829a780b 100644
--- a/lang/perl/BerkeleyDB/typemap
+++ b/lang/perl/BerkeleyDB/typemap
@@ -14,6 +14,7 @@ db_seq_t 		T_PV_64
 u_int			T_U_INT
 u_int32_t		T_U_INT
 int32_t		    T_U_INT
+db_off_t		T_INT
 db_timeout_t	T_U_INT
 const char * 		T_PV_NULL
 PV_or_NULL		T_PV_NULL
@@ -29,6 +30,7 @@ BerkeleyDB::Heap	T_PTROBJ_AV
 BerkeleyDB::Recno	T_PTROBJ_AV
 BerkeleyDB::Queue	T_PTROBJ_AV
 BerkeleyDB::Cursor	T_PTROBJ_AV
+BerkeleyDB::DbStream	T_PTROBJ_AV
 BerkeleyDB::TxnMgr	T_PTROBJ_AV
 BerkeleyDB::Txn		T_PTROBJ_AV
 BerkeleyDB::Log		T_PTROBJ_AV
@@ -44,6 +46,7 @@ BerkeleyDB::Heap::Raw	T_RAW
 BerkeleyDB::Recno::Raw	T_RAW
 BerkeleyDB::Queue::Raw	T_RAW
 BerkeleyDB::Cursor::Raw	T_RAW
+BerkeleyDB::DbStream::Raw	T_RAW
 BerkeleyDB::TxnMgr::Raw	T_RAW
 BerkeleyDB::Txn::Raw	T_RAW
 BerkeleyDB::Log::Raw	T_RAW
@@ -58,8 +61,10 @@ BerkeleyDB::TxnMgr::Inner	T_INNER
 DBT			T_dbtdatum
 DBT_OPT			T_dbtdatum_opt
 DBT_B			T_dbtdatum_btree
+DBT_Blob		T_dbtdatum_blob
 DBTKEY			T_dbtkeydatum
 DBTKEY_B		T_dbtkeydatum_btree
+DBTKEY_B4Blob   T_dbtkeydatum_btree_for_blob
 DBTKEY_Br		T_dbtkeydatum_btree_r
 DBTKEY_Bpr		T_dbtkeydatum_btree_pr
 DBTKEY_seq		T_dbtkeydatum_seq
@@ -70,6 +75,7 @@ BerkeleyDB_ENV_type *	T_IV
 BerkeleyDB_TxnMgr_type * T_IV
 BerkeleyDB_Txn_type *	T_IV
 BerkeleyDB__Cursor_type * T_IV
+BerkeleyDB__DbStream_type * T_IV
 DB *			T_IV
 DB_ENV *		T_IV
 
@@ -256,6 +262,30 @@ T_dbtkeydatum_btree
 	    }
 	}
 
+T_dbtkeydatum_btree_for_blob
+	{
+	    SV* my_sv = $arg ;
+	    if (! isHeapDb(db))
+	        DBM_ckFilter(my_sv, filter_store_key, \"filter_store_key\");
+	    DBT_clear($var) ;
+            SvGETMAGIC($arg) ;
+            STRLEN len;
+	        $var.data = SvPV(my_sv, len);
+            $var.size = (int)len;
+	}
+
+T_dbtdatum_blob
+	{
+	    SV* my_sv = $arg ;
+	    DBT_clear($var) ;
+        SvGETMAGIC($arg) ;
+        STRLEN len;
+        SvUPGRADE($arg, SVt_PV); SvOOK_off($arg); SvPOK_only($arg);
+	    $var.data = SvPVbyte_force(my_sv, len);
+        $var.ulen = (int)len;
+        $var.flags = DB_DBT_APPMALLOC | DB_DBT_USERMEM;
+	}
+
 T_dbtkeydatum_btree_r
 	{
 	    SV* my_sv = $arg ;
@@ -381,6 +411,8 @@ T_PV_64
 
 T_dbtkeydatum_btree
 	OutputKey_B($arg, $var)
+T_dbtkeydatum_btree_for_blob
+	OutputKeyBlob($arg, $var)
 T_dbtkeydatum_btree_r
 	OutputKey_Br($arg, $var)
 T_dbtkeydatum_btree_pr
@@ -391,6 +423,8 @@ T_dbtkeydatum
 	OutputKey($arg, $var)
 T_dbtdatum
 	OutputValue($arg, $var)
+T_dbtdatum_blob
+	OutputValue($arg, $var)
 T_dbtdatum_opt
 	OutputValue($arg, $var)
 T_dbtdatum_btree
diff --git a/lang/perl/DB_File/Changes b/lang/perl/DB_File/Changes
index f527911f..c76b08e3 100644
--- a/lang/perl/DB_File/Changes
+++ b/lang/perl/DB_File/Changes
@@ -1,3 +1,22 @@
+1.828 7 May 2013
+
+   * Minor change to build with Berkeley DB 6.x
+
+1.827 25 Jan 2012
+
+   * DB_File.pm - Don't use "@_" construct
+     [RT ##79287]
+
+1.826 25 Jan 2012
+
+   * t/db-btree.t - fix use of "length @array"
+     [RT ##74336]
+
+1.825 24 Jan 2012
+
+   * t/db-btree.t - fix use of "length @array"
+     [RT ##74336]
+
 1.824 6 Aug 2011
 
    * Amendments to tests to work in blead
diff --git a/lang/perl/DB_File/DB_File.pm b/lang/perl/DB_File/DB_File.pm
index d7fba44e..9c225ae1 100644
--- a/lang/perl/DB_File/DB_File.pm
+++ b/lang/perl/DB_File/DB_File.pm
@@ -1,10 +1,8 @@
 # DB_File.pm -- Perl 5 interface to Berkeley DB 
 #
-# written by Paul Marquess (pmqs@cpan.org)
-# last modified 28th October 2007
-# version 1.818
+# Written by Paul Marquess (pmqs@cpan.org)
 #
-#     Copyright (c) 1995-2009 Paul Marquess. All rights reserved.
+#     Copyright (c) 1995-2014 Paul Marquess. All rights reserved.
 #     This program is free software; you can redistribute it and/or
 #     modify it under the same terms as Perl itself.
 
@@ -165,17 +163,17 @@ our ($db_version, $use_XSLoader, $splice_end_array_no_length, $splice_end_array,
 use Carp;
 
 
-$VERSION = "1.824" ;
+$VERSION = "1.828" ;
 $VERSION = eval $VERSION; # needed for dev releases
 
 {
-    local $SIG{__WARN__} = sub {$splice_end_array_no_length = "@_";};
+    local $SIG{__WARN__} = sub {$splice_end_array_no_length = join(" ",@_);};
     my @a =(1); splice(@a, 3);
     $splice_end_array_no_length = 
         ($splice_end_array_no_length =~ /^splice\(\) offset past end of array at /);
 }      
 {
-    local $SIG{__WARN__} = sub {$splice_end_array = "@_";};
+    local $SIG{__WARN__} = sub {$splice_end_array = join(" ", @_);};
     my @a =(1); splice(@a, 3, 1);
     $splice_end_array = 
         ($splice_end_array =~ /^splice\(\) offset past end of array at /);
@@ -2279,7 +2277,7 @@ archive in F<src/misc/db.1.85.tar.gz>.
 
 =head1 COPYRIGHT
 
-Copyright (c) 1995-2007 Paul Marquess. All rights reserved. This program
+Copyright (c) 1995-2012 Paul Marquess. All rights reserved. This program
 is free software; you can redistribute it and/or modify it under the
 same terms as Perl itself.
 
diff --git a/lang/perl/DB_File/DB_File.xs b/lang/perl/DB_File/DB_File.xs
index e61dc134..c0aecf97 100644
--- a/lang/perl/DB_File/DB_File.xs
+++ b/lang/perl/DB_File/DB_File.xs
@@ -2,13 +2,11 @@
 
  DB_File.xs -- Perl 5 interface to Berkeley DB 
 
- written by Paul Marquess <pmqs@cpan.org>
- last modified 4th February 2007
- version 1.818
+ Written by Paul Marquess <pmqs@cpan.org>
 
  All comments/suggestions/problems are welcome
 
-     Copyright (c) 1995-2009 Paul Marquess. All rights reserved.
+     Copyright (c) 1995-2014 Paul Marquess. All rights reserved.
      This program is free software; you can redistribute it and/or
      modify it under the same terms as Perl itself.
 
@@ -208,6 +206,10 @@
 #    define AT_LEAST_DB_4_3
 #endif
 
+#if DB_VERSION_MAJOR >= 6 
+#    define AT_LEAST_DB_6_0
+#endif
+
 #ifdef AT_LEAST_DB_3_3
 #   define WANT_ERROR
 #endif
@@ -536,6 +538,19 @@ tidyUp(DB_File db)
 
 
 static int
+
+#ifdef AT_LEAST_DB_6_0
+#ifdef CAN_PROTOTYPE
+btree_compare(DB * db, const DBT *key1, const DBT *key2, size_t* locp)
+#else
+btree_compare(db, key1, key2, locp)
+DB * db ;
+const DBT * key1 ;
+const DBT * key2 ;
+size_t* locp;
+#endif /* CAN_PROTOTYPE */
+
+#else /* Berkeley DB < 6.0 */
 #ifdef AT_LEAST_DB_3_2
 
 #ifdef CAN_PROTOTYPE
@@ -558,6 +573,7 @@ const DBT * key2 ;
 #endif
 
 #endif
+#endif
 
 {
 #ifdef dTHX
diff --git a/lang/perl/DB_File/MANIFEST b/lang/perl/DB_File/MANIFEST
index 20b3973a..e460e81e 100644
--- a/lang/perl/DB_File/MANIFEST
+++ b/lang/perl/DB_File/MANIFEST
@@ -30,3 +30,4 @@ t/pod.t
 typemap
 version.c
 META.yml                                 Module meta-data (added by MakeMaker)
+META.json                                Module JSON meta-data (added by MakeMaker)
diff --git a/lang/perl/DB_File/META.json b/lang/perl/DB_File/META.json
new file mode 100644
index 00000000..f519dd0b
--- /dev/null
+++ b/lang/perl/DB_File/META.json
@@ -0,0 +1,39 @@
+{
+   "abstract" : "Perl5 access to Berkeley DB version 1.x",
+   "author" : [
+      "Paul Marquess <pmqs@cpan.org>"
+   ],
+   "dynamic_config" : 1,
+   "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630",
+   "license" : [
+      "perl_5"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : "2"
+   },
+   "name" : "DB_File",
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
+   "prereqs" : {
+      "build" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "runtime" : {
+         "requires" : {}
+      }
+   },
+   "release_status" : "stable",
+   "version" : "1.828"
+}
diff --git a/lang/perl/DB_File/META.yml b/lang/perl/DB_File/META.yml
index 2981b68b..341aba44 100644
--- a/lang/perl/DB_File/META.yml
+++ b/lang/perl/DB_File/META.yml
@@ -1,21 +1,21 @@
---- #YAML:1.0
-name:               DB_File
-version:            1.824
-abstract:           Perl5 access to Berkeley DB version 1.x
+---
+abstract: 'Perl5 access to Berkeley DB version 1.x'
 author:
-    - Paul Marquess <pmqs@cpan.org>
-license:            perl
-distribution_type:  module
-configure_requires:
-    ExtUtils::MakeMaker:  0
+  - 'Paul Marquess <pmqs@cpan.org>'
 build_requires:
-    ExtUtils::MakeMaker:  0
-requires:  {}
-no_index:
-    directory:
-        - t
-        - inc
-generated_by:       ExtUtils::MakeMaker version 6.54
+  ExtUtils::MakeMaker: 0
+configure_requires:
+  ExtUtils::MakeMaker: 0
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.120630'
+license: perl
 meta-spec:
-    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
-    version:  1.4
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4
+name: DB_File
+no_index:
+  directory:
+    - t
+    - inc
+requires: {}
+version: 1.828
diff --git a/lang/perl/DB_File/README b/lang/perl/DB_File/README
index 719b96e1..813cc893 100644
--- a/lang/perl/DB_File/README
+++ b/lang/perl/DB_File/README
@@ -1,10 +1,10 @@
                                   DB_File
 
-                               Version 1.824
+                               Version 1.828
 
-                              6th August 2011
+                               7th May 2013
 
-     Copyright (c) 1995-2011 Paul Marquess. All rights reserved. This
+     Copyright (c) 1995-2014 Paul Marquess. All rights reserved. This
       program is free software; you can redistribute it and/or modify
                   it under the same terms as Perl itself.
 
@@ -22,11 +22,11 @@ DESCRIPTION
 
 DB_File is a module which allows Perl programs to make use of the
 facilities provided by Berkeley DB version 1. (DB_File can be built
-version 2, 3 or 4 of Berkeley DB, but it will only support the 1.x
-features),
+version 2, or greater, of Berkeley DB, but it will only support the 1.x
+features).
 
 If you want to make use of the new features available in Berkeley DB
-2.x, 3.x or 4.x, use the Perl module BerkeleyDB instead.
+2.x, or greater, use the Perl module BerkeleyDB instead.
 
 Berkeley DB is a C library which provides a consistent interface to a
 number of database formats. DB_File provides an interface to all three
diff --git a/lang/perl/DB_File/dbinfo b/lang/perl/DB_File/dbinfo
index b8cd65a9..e8abc974 100644
--- a/lang/perl/DB_File/dbinfo
+++ b/lang/perl/DB_File/dbinfo
@@ -7,7 +7,7 @@
 # Version: 	1.06 
 # Date		27th March 2008
 #
-#     Copyright (c) 1998-2008 Paul Marquess. All rights reserved.
+#     Copyright (c) 1998-2012 Paul Marquess. All rights reserved.
 #     This program is free software; you can redistribute it and/or
 #     modify it under the same terms as Perl itself.
 
diff --git a/lang/perl/DB_File/t/db-btree.t b/lang/perl/DB_File/t/db-btree.t
index 29c70a17..fb89a408 100644
--- a/lang/perl/DB_File/t/db-btree.t
+++ b/lang/perl/DB_File/t/db-btree.t
@@ -566,9 +566,9 @@ sub ArrayCompare
  
     return 0 if @$a != @$b ;
  
-    foreach (1 .. length @$a)
+    foreach (0 .. @$a - 1)
     {
-        return 0 unless $$a[$_] eq $$b[$_] ;
+        return 0 unless $$a[$_] eq $$b[$_];
     }
  
     1 ;