BDB 4.1.24

BitKeeper/deleted/.del-ex_access.wpj~3df6ae8c99bf7c5f:
  Delete: bdb/build_vxworks/ex_access/ex_access.wpj
BitKeeper/deleted/.del-ex_btrec.wpj~a7622f1c6f432dc6:
  Delete: bdb/build_vxworks/ex_btrec/ex_btrec.wpj
BitKeeper/deleted/.del-ex_dbclient.wpj~7345440f3b204cdd:
  Delete: bdb/build_vxworks/ex_dbclient/ex_dbclient.wpj
BitKeeper/deleted/.del-ex_env.wpj~fbe1ab10b04e8b74:
  Delete: bdb/build_vxworks/ex_env/ex_env.wpj
BitKeeper/deleted/.del-ex_mpool.wpj~4479cfd5c45f327d:
  Delete: bdb/build_vxworks/ex_mpool/ex_mpool.wpj
BitKeeper/deleted/.del-ex_tpcb.wpj~f78093006e14bf41:
  Delete: bdb/build_vxworks/ex_tpcb/ex_tpcb.wpj
BitKeeper/deleted/.del-db_buildall.dsp~bd749ff6da11682:
  Delete: bdb/build_win32/db_buildall.dsp
BitKeeper/deleted/.del-cxx_app.cpp~ad8df8e0791011ed:
  Delete: bdb/cxx/cxx_app.cpp
BitKeeper/deleted/.del-cxx_log.cpp~a50ff3118fe06952:
  Delete: bdb/cxx/cxx_log.cpp
BitKeeper/deleted/.del-cxx_table.cpp~ecd751e79b055556:
  Delete: bdb/cxx/cxx_table.cpp
BitKeeper/deleted/.del-namemap.txt~796a3acd3885d8fd:
  Delete: bdb/cxx/namemap.txt
BitKeeper/deleted/.del-Design.fileop~3ca4da68f1727373:
  Delete: bdb/db/Design.fileop
BitKeeper/deleted/.del-db185_int.h~61bee3736e7959ef:
  Delete: bdb/db185/db185_int.h
BitKeeper/deleted/.del-acconfig.h~411e8854d67ad8b5:
  Delete: bdb/dist/acconfig.h
BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
  Delete: bdb/dist/aclocal/mutex.m4
BitKeeper/deleted/.del-options.m4~b9d0ca637213750a:
  Delete: bdb/dist/aclocal/options.m4
BitKeeper/deleted/.del-programs.m4~3ce7890b47732b30:
  Delete: bdb/dist/aclocal/programs.m4
BitKeeper/deleted/.del-tcl.m4~f944e2db93c3b6db:
  Delete: bdb/dist/aclocal/tcl.m4
BitKeeper/deleted/.del-types.m4~59cae158c9a32cff:
  Delete: bdb/dist/aclocal/types.m4
BitKeeper/deleted/.del-script~d38f6d3a4f159cb4:
  Delete: bdb/dist/build/script
BitKeeper/deleted/.del-configure.in~ac795a92c8fe049c:
  Delete: bdb/dist/configure.in
BitKeeper/deleted/.del-ltconfig~66bbd007d8024af:
  Delete: bdb/dist/ltconfig
BitKeeper/deleted/.del-rec_ctemp~a28554362534f00a:
  Delete: bdb/dist/rec_ctemp
BitKeeper/deleted/.del-s_tcl~2ffe4326459fcd9f:
  Delete: bdb/dist/s_tcl
BitKeeper/deleted/.del-.IGNORE_ME~d8148b08fa7d5d15:
  Delete: bdb/dist/template/.IGNORE_ME
BitKeeper/deleted/.del-btree.h~179f2aefec1753d:
  Delete: bdb/include/btree.h
BitKeeper/deleted/.del-cxx_int.h~6b649c04766508f8:
  Delete: bdb/include/cxx_int.h
BitKeeper/deleted/.del-db.src~6b433ae615b16a8d:
  Delete: bdb/include/db.src
BitKeeper/deleted/.del-db_185.h~ad8b373d9391d35c:
  Delete: bdb/include/db_185.h
BitKeeper/deleted/.del-db_am.h~a714912b6b75932f:
  Delete: bdb/include/db_am.h
BitKeeper/deleted/.del-db_cxx.h~fcafadf45f5d19e9:
  Delete: bdb/include/db_cxx.h
BitKeeper/deleted/.del-db_dispatch.h~6844f20f7eb46904:
  Delete: bdb/include/db_dispatch.h
BitKeeper/deleted/.del-db_int.src~419a3f48b6a01da7:
  Delete: bdb/include/db_int.src
BitKeeper/deleted/.del-db_join.h~76f9747a42c3399a:
  Delete: bdb/include/db_join.h
BitKeeper/deleted/.del-db_page.h~e302ca3a4db3abdc:
  Delete: bdb/include/db_page.h
BitKeeper/deleted/.del-db_server_int.h~e1d20b6ba3bca1ab:
  Delete: bdb/include/db_server_int.h
BitKeeper/deleted/.del-db_shash.h~5fbf2d696fac90f3:
  Delete: bdb/include/db_shash.h
BitKeeper/deleted/.del-db_swap.h~1e60887550864a59:
  Delete: bdb/include/db_swap.h
BitKeeper/deleted/.del-db_upgrade.h~c644eee73701fc8d:
  Delete: bdb/include/db_upgrade.h
BitKeeper/deleted/.del-db_verify.h~b8d6c297c61f342e:
  Delete: bdb/include/db_verify.h
BitKeeper/deleted/.del-debug.h~dc2b4f2cf27ccebc:
  Delete: bdb/include/debug.h
BitKeeper/deleted/.del-hash.h~2aaa548b28882dfb:
  Delete: bdb/include/hash.h
BitKeeper/deleted/.del-lock.h~a761c1b7de57b77f:
  Delete: bdb/include/lock.h
BitKeeper/deleted/.del-log.h~ff20184238e35e4d:
  Delete: bdb/include/log.h
BitKeeper/deleted/.del-mp.h~7e317597622f3411:
  Delete: bdb/include/mp.h
BitKeeper/deleted/.del-mutex.h~d3ae7a2977a68137:
  Delete: bdb/include/mutex.h
BitKeeper/deleted/.del-os.h~91867cc8757cd0e3:
  Delete: bdb/include/os.h
BitKeeper/deleted/.del-os_jump.h~e1b939fa5151d4be:
  Delete: bdb/include/os_jump.h
BitKeeper/deleted/.del-qam.h~6fad0c1b5723d597:
  Delete: bdb/include/qam.h
BitKeeper/deleted/.del-queue.h~4c72c0826c123d5:
  Delete: bdb/include/queue.h
BitKeeper/deleted/.del-region.h~513fe04d977ca0fc:
  Delete: bdb/include/region.h
BitKeeper/deleted/.del-shqueue.h~525fc3e6c2025c36:
  Delete: bdb/include/shqueue.h
BitKeeper/deleted/.del-tcl_db.h~c536fd61a844f23f:
  Delete: bdb/include/tcl_db.h
BitKeeper/deleted/.del-txn.h~c8d94b221ec147e4:
  Delete: bdb/include/txn.h
BitKeeper/deleted/.del-xa.h~ecc466493aae9d9a:
  Delete: bdb/include/xa.h
BitKeeper/deleted/.del-DbRecoveryInit.java~756b52601a0b9023:
  Delete: bdb/java/src/com/sleepycat/db/DbRecoveryInit.java
BitKeeper/deleted/.del-DbTxnRecover.java~74607cba7ab89d6d:
  Delete: bdb/java/src/com/sleepycat/db/DbTxnRecover.java
BitKeeper/deleted/.del-lock_conflict.c~fc5e0f14cf597a2b:
  Delete: bdb/lock/lock_conflict.c
BitKeeper/deleted/.del-log.src~53ac9e7b5cb023f2:
  Delete: bdb/log/log.src
BitKeeper/deleted/.del-log_findckp.c~24287f008916e81f:
  Delete: bdb/log/log_findckp.c
BitKeeper/deleted/.del-log_rec.c~d51711f2cac09297:
  Delete: bdb/log/log_rec.c
BitKeeper/deleted/.del-log_register.c~b40bb4efac75ca15:
  Delete: bdb/log/log_register.c
BitKeeper/deleted/.del-Design~b3d0f179f2767b:
  Delete: bdb/mp/Design
BitKeeper/deleted/.del-os_finit.c~95dbefc6fe79b26c:
  Delete: bdb/os/os_finit.c
BitKeeper/deleted/.del-os_abs.c~df95d1e7db81924:
  Delete: bdb/os_vxworks/os_abs.c
BitKeeper/deleted/.del-os_finit.c~803b484bdb9d0122:
  Delete: bdb/os_vxworks/os_finit.c
BitKeeper/deleted/.del-os_map.c~3a6d7926398b76d3:
  Delete: bdb/os_vxworks/os_map.c
BitKeeper/deleted/.del-os_finit.c~19a227c6d3c78ad:
  Delete: bdb/os_win32/os_finit.c
BitKeeper/deleted/.del-log-corruption.patch~1cf2ecc7c6408d5d:
  Delete: bdb/patches/log-corruption.patch
BitKeeper/deleted/.del-Btree.pm~af6d0c5eaed4a98e:
  Delete: bdb/perl.BerkeleyDB/BerkeleyDB/Btree.pm
BitKeeper/deleted/.del-BerkeleyDB.pm~7244036d4482643:
  Delete: bdb/perl.BerkeleyDB/BerkeleyDB.pm
BitKeeper/deleted/.del-BerkeleyDB.pod~e7b18fd6132448e3:
  Delete: bdb/perl.BerkeleyDB/BerkeleyDB.pod
BitKeeper/deleted/.del-Hash.pm~10292a26c06a5c95:
  Delete: bdb/perl.BerkeleyDB/BerkeleyDB/Hash.pm
BitKeeper/deleted/.del-BerkeleyDB.pod.P~79f76a1495eda203:
  Delete: bdb/perl.BerkeleyDB/BerkeleyDB.pod.P
BitKeeper/deleted/.del-BerkeleyDB.xs~80c99afbd98e392c:
  Delete: bdb/perl.BerkeleyDB/BerkeleyDB.xs
BitKeeper/deleted/.del-Changes~729c1891efa60de9:
  Delete: bdb/perl.BerkeleyDB/Changes
BitKeeper/deleted/.del-MANIFEST~63a1e34aecf157a0:
  Delete: bdb/perl.BerkeleyDB/MANIFEST
BitKeeper/deleted/.del-Makefile.PL~c68797707d8df87a:
  Delete: bdb/perl.BerkeleyDB/Makefile.PL
BitKeeper/deleted/.del-README~5f2f579b1a241407:
  Delete: bdb/perl.BerkeleyDB/README
BitKeeper/deleted/.del-Todo~dca3c66c193adda9:
  Delete: bdb/perl.BerkeleyDB/Todo
BitKeeper/deleted/.del-config.in~ae81681e450e0999:
  Delete: bdb/perl.BerkeleyDB/config.in
BitKeeper/deleted/.del-dbinfo~28ad67d83be4f68e:
  Delete: bdb/perl.BerkeleyDB/dbinfo
BitKeeper/deleted/.del-mkconsts~543ab60669c7a04e:
  Delete: bdb/perl.BerkeleyDB/mkconsts
BitKeeper/deleted/.del-mkpod~182c0ca54e439afb:
  Delete: bdb/perl.BerkeleyDB/mkpod
BitKeeper/deleted/.del-5.004~e008cb5a48805543:
  Delete: bdb/perl.BerkeleyDB/patches/5.004
BitKeeper/deleted/.del-irix_6_5.pl~61662bb08afcdec8:
  Delete: bdb/perl.BerkeleyDB/hints/irix_6_5.pl
BitKeeper/deleted/.del-solaris.pl~6771e7182394e152:
  Delete: bdb/perl.BerkeleyDB/hints/solaris.pl
BitKeeper/deleted/.del-typemap~783b8f5295b05f3d:
  Delete: bdb/perl.BerkeleyDB/typemap
BitKeeper/deleted/.del-5.004_01~6081ce2fff7b0bc:
  Delete: bdb/perl.BerkeleyDB/patches/5.004_01
BitKeeper/deleted/.del-5.004_02~87214eac35ad9e6:
  Delete: bdb/perl.BerkeleyDB/patches/5.004_02
BitKeeper/deleted/.del-5.004_03~9a672becec7cb40f:
  Delete: bdb/perl.BerkeleyDB/patches/5.004_03
BitKeeper/deleted/.del-5.004_04~e326cb51af09d154:
  Delete: bdb/perl.BerkeleyDB/patches/5.004_04
BitKeeper/deleted/.del-5.004_05~7ab457a1e41a92fe:
  Delete: bdb/perl.BerkeleyDB/patches/5.004_05
BitKeeper/deleted/.del-5.005~f9e2d59b5964cd4b:
  Delete: bdb/perl.BerkeleyDB/patches/5.005
BitKeeper/deleted/.del-5.005_01~3eb9fb7b5842ea8e:
  Delete: bdb/perl.BerkeleyDB/patches/5.005_01
BitKeeper/deleted/.del-5.005_02~67477ce0bef717cb:
  Delete: bdb/perl.BerkeleyDB/patches/5.005_02
BitKeeper/deleted/.del-5.005_03~c4c29a1fb21e290a:
  Delete: bdb/perl.BerkeleyDB/patches/5.005_03
BitKeeper/deleted/.del-5.6.0~e1fb9897d124ee22:
  Delete: bdb/perl.BerkeleyDB/patches/5.6.0
BitKeeper/deleted/.del-btree.t~e4a1a3c675ddc406:
  Delete: bdb/perl.BerkeleyDB/t/btree.t
BitKeeper/deleted/.del-db-3.0.t~d2c60991d84558f2:
  Delete: bdb/perl.BerkeleyDB/t/db-3.0.t
BitKeeper/deleted/.del-db-3.1.t~6ee88cd13f55e018:
  Delete: bdb/perl.BerkeleyDB/t/db-3.1.t
BitKeeper/deleted/.del-db-3.2.t~f73b6461f98fd1cf:
  Delete: bdb/perl.BerkeleyDB/t/db-3.2.t
BitKeeper/deleted/.del-destroy.t~cc6a2ae1980a2ecd:
  Delete: bdb/perl.BerkeleyDB/t/destroy.t
BitKeeper/deleted/.del-env.t~a8604a4499c4bd07:
  Delete: bdb/perl.BerkeleyDB/t/env.t
BitKeeper/deleted/.del-examples.t~2571b77c3cc75574:
  Delete: bdb/perl.BerkeleyDB/t/examples.t
BitKeeper/deleted/.del-examples.t.T~8228bdd75ac78b88:
  Delete: bdb/perl.BerkeleyDB/t/examples.t.T
BitKeeper/deleted/.del-examples3.t.T~66a186897a87026d:
  Delete: bdb/perl.BerkeleyDB/t/examples3.t.T
BitKeeper/deleted/.del-examples3.t~fe3822ba2f2d7f83:
  Delete: bdb/perl.BerkeleyDB/t/examples3.t
BitKeeper/deleted/.del-filter.t~f87b045c1b708637:
  Delete: bdb/perl.BerkeleyDB/t/filter.t
BitKeeper/deleted/.del-hash.t~616bfb4d644de3a3:
  Delete: bdb/perl.BerkeleyDB/t/hash.t
BitKeeper/deleted/.del-join.t~29fc39f74a83ca22:
  Delete: bdb/perl.BerkeleyDB/t/join.t
BitKeeper/deleted/.del-mldbm.t~31f5015341eea040:
  Delete: bdb/perl.BerkeleyDB/t/mldbm.t
BitKeeper/deleted/.del-queue.t~8f338034ce44a641:
  Delete: bdb/perl.BerkeleyDB/t/queue.t
BitKeeper/deleted/.del-recno.t~d4ddbd3743add63e:
  Delete: bdb/perl.BerkeleyDB/t/recno.t
BitKeeper/deleted/.del-strict.t~6885cdd2ea71ca2d:
  Delete: bdb/perl.BerkeleyDB/t/strict.t
BitKeeper/deleted/.del-subdb.t~aab62a5d5864c603:
  Delete: bdb/perl.BerkeleyDB/t/subdb.t
BitKeeper/deleted/.del-txn.t~65033b8558ae1216:
  Delete: bdb/perl.BerkeleyDB/t/txn.t
BitKeeper/deleted/.del-unknown.t~f3710458682665e1:
  Delete: bdb/perl.BerkeleyDB/t/unknown.t
BitKeeper/deleted/.del-Changes~436f74a5c414c65b:
  Delete: bdb/perl.DB_File/Changes
BitKeeper/deleted/.del-DB_File.pm~ae0951c6c7665a82:
  Delete: bdb/perl.DB_File/DB_File.pm
BitKeeper/deleted/.del-DB_File.xs~89e49a0b5556f1d8:
  Delete: bdb/perl.DB_File/DB_File.xs
BitKeeper/deleted/.del-DB_File_BS~290fad5dbbb87069:
  Delete: bdb/perl.DB_File/DB_File_BS
BitKeeper/deleted/.del-MANIFEST~90ee581572bdd4ac:
  Delete: bdb/perl.DB_File/MANIFEST
BitKeeper/deleted/.del-Makefile.PL~ac0567bb5a377e38:
  Delete: bdb/perl.DB_File/Makefile.PL
BitKeeper/deleted/.del-README~77e924a5a9bae6b3:
  Delete: bdb/perl.DB_File/README
BitKeeper/deleted/.del-config.in~ab4c2792b86a810b:
  Delete: bdb/perl.DB_File/config.in
BitKeeper/deleted/.del-dbinfo~461c43b30fab2cb:
  Delete: bdb/perl.DB_File/dbinfo
BitKeeper/deleted/.del-dynixptx.pl~50dcddfae25d17e9:
  Delete: bdb/perl.DB_File/hints/dynixptx.pl
BitKeeper/deleted/.del-typemap~55cffb3288a9e587:
  Delete: bdb/perl.DB_File/typemap
BitKeeper/deleted/.del-version.c~a4df0e646f8b3975:
  Delete: bdb/perl.DB_File/version.c
BitKeeper/deleted/.del-5.004_01~d6830d0082702af7:
  Delete: bdb/perl.DB_File/patches/5.004_01
BitKeeper/deleted/.del-5.004_02~78b082dc80c91031:
  Delete: bdb/perl.DB_File/patches/5.004_02
BitKeeper/deleted/.del-5.004~4411ec2e3c9e008b:
  Delete: bdb/perl.DB_File/patches/5.004
BitKeeper/deleted/.del-sco.pl~1e795fe14fe4dcfe:
  Delete: bdb/perl.DB_File/hints/sco.pl
BitKeeper/deleted/.del-5.004_03~33f274648b160d95:
  Delete: bdb/perl.DB_File/patches/5.004_03
BitKeeper/deleted/.del-5.004_04~8f3d1b3cf18bb20a:
  Delete: bdb/perl.DB_File/patches/5.004_04
BitKeeper/deleted/.del-5.004_05~9c0f02e7331e142:
  Delete: bdb/perl.DB_File/patches/5.004_05
BitKeeper/deleted/.del-5.005~c2108cb2e3c8d951:
  Delete: bdb/perl.DB_File/patches/5.005
BitKeeper/deleted/.del-5.005_01~3b45e9673afc4cfa:
  Delete: bdb/perl.DB_File/patches/5.005_01
BitKeeper/deleted/.del-5.005_02~9fe5766bb02a4522:
  Delete: bdb/perl.DB_File/patches/5.005_02
BitKeeper/deleted/.del-5.005_03~ffa1c38c19ae72ea:
  Delete: bdb/perl.DB_File/patches/5.005_03
BitKeeper/deleted/.del-5.6.0~373be3a5ce47be85:
  Delete: bdb/perl.DB_File/patches/5.6.0
BitKeeper/deleted/.del-db-btree.t~3231595a1c241eb3:
  Delete: bdb/perl.DB_File/t/db-btree.t
BitKeeper/deleted/.del-db-hash.t~7c4ad0c795c7fad2:
  Delete: bdb/perl.DB_File/t/db-hash.t
BitKeeper/deleted/.del-db-recno.t~6c2d3d80b9ba4a50:
  Delete: bdb/perl.DB_File/t/db-recno.t
BitKeeper/deleted/.del-db_server.sed~cdb00ebcd48a64e2:
  Delete: bdb/rpc_server/db_server.sed
BitKeeper/deleted/.del-db_server_proc.c~d46c8f409c3747f4:
  Delete: bdb/rpc_server/db_server_proc.c
BitKeeper/deleted/.del-db_server_svc.sed~3f5e59f334fa4607:
  Delete: bdb/rpc_server/db_server_svc.sed
BitKeeper/deleted/.del-db_server_util.c~a809f3a4629acda:
  Delete: bdb/rpc_server/db_server_util.c
BitKeeper/deleted/.del-log.tcl~ff1b41f1355b97d7:
  Delete: bdb/test/log.tcl
BitKeeper/deleted/.del-mpool.tcl~b0df4dc1b04db26c:
  Delete: bdb/test/mpool.tcl
BitKeeper/deleted/.del-mutex.tcl~52fd5c73a150565:
  Delete: bdb/test/mutex.tcl
BitKeeper/deleted/.del-txn.tcl~c4ff071550b5446e:
  Delete: bdb/test/txn.tcl
BitKeeper/deleted/.del-README~e800a12a5392010a:
  Delete: bdb/test/upgrade/README
BitKeeper/deleted/.del-pack-2.6.6.pl~89d5076d758d3e98:
  Delete: bdb/test/upgrade/generate-2.X/pack-2.6.6.pl
BitKeeper/deleted/.del-test-2.6.patch~4a52dc83d447547b:
  Delete: bdb/test/upgrade/generate-2.X/test-2.6.patch

1 files changed, 149 insertions, 98 deletions

diff --git a/bdb/env/env_region.c b/bdb/env/env_region.c
index f3df4bac184..a919cf328b4 100644
--- a/bdb/env/env_region.c
+++ b/bdb/env/env_region.c
@@ -1,14 +1,14 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997, 1998, 1999, 2000
+ * Copyright (c) 1996-2002
  *	Sleepycat Software.  All rights reserved.
  */
 
 #include "db_config.h"
 
 #ifndef lint
-static const char revid[] = "$Id: env_region.c,v 11.28 2000/12/12 17:36:10 bostic Exp $";
+static const char revid[] = "$Id: env_region.c,v 11.64 2002/07/17 15:09:19 bostic Exp $";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -20,20 +20,17 @@ static const char revid[] = "$Id: env_region.c,v 11.28 2000/12/12 17:36:10 bosti
 #endif
 
 #include "db_int.h"
-#include "db_shash.h"
-#include "lock.h"
-#include "lock_ext.h"
-#include "log.h"
-#include "log_ext.h"
-#include "mp.h"
-#include "mp_ext.h"
-#include "txn.h"
-#include "txn_ext.h"
+#include "dbinc/db_shash.h"
+#include "dbinc/lock.h"
+#include "dbinc/log.h"
+#include "dbinc/mp.h"
+#include "dbinc/rep.h"
+#include "dbinc/txn.h"
 
 static int  __db_des_destroy __P((DB_ENV *, REGION *));
 static int  __db_des_get __P((DB_ENV *, REGINFO *, REGINFO *, REGION **));
 static int  __db_e_remfile __P((DB_ENV *));
-static int  __db_faultmem __P((void *, size_t, int));
+static int  __db_faultmem __P((DB_ENV *, void *, size_t, int));
 static void __db_region_destroy __P((DB_ENV *, REGINFO *));
 
 /*
@@ -110,13 +107,17 @@ loop:	renv = NULL;
 	 * If this is a public environment, we use the filesystem to ensure
 	 * the creation of the environment file is single-threaded.
 	 */
-	if (F_ISSET(dbenv, DB_ENV_PRIVATE))
+	if (F_ISSET(dbenv, DB_ENV_PRIVATE)) {
+		if ((ret = __os_strdup(dbenv,
+		    "process-private", &infop->name)) != 0)
+			goto err;
 		goto creation;
+	}
 
 	/* Build the region name. */
 	(void)snprintf(buf, sizeof(buf), "%s", DB_REGION_ENV);
 	if ((ret = __db_appname(dbenv,
-	    DB_APP_NONE, NULL, buf, 0, NULL, &infop->name)) != 0)
+	    DB_APP_NONE, buf, 0, NULL, &infop->name)) != 0)
 		goto err;
 
 	/*
@@ -128,8 +129,8 @@ loop:	renv = NULL;
 	 * errno return value -- I sure hope they're right.
 	 */
 	if (F_ISSET(dbenv, DB_ENV_CREATE)) {
-		if ((ret = __os_open(dbenv,
-		    infop->name, DB_OSO_REGION | DB_OSO_CREATE | DB_OSO_EXCL,
+		if ((ret = __os_open(dbenv, infop->name,
+		    DB_OSO_CREATE | DB_OSO_DIRECT | DB_OSO_EXCL | DB_OSO_REGION,
 		    dbenv->db_mode, dbenv->lockfhp)) == 0)
 			goto creation;
 		if (ret != EEXIST) {
@@ -143,8 +144,8 @@ loop:	renv = NULL;
 	 * If we couldn't create the file, try and open it.  (If that fails,
 	 * we're done.)
 	 */
-	if ((ret = __os_open(dbenv, infop->name,
-	    DB_OSO_REGION, dbenv->db_mode, dbenv->lockfhp)) != 0)
+	if ((ret = __os_open(dbenv, infop->name, DB_OSO_REGION | DB_OSO_DIRECT,
+	    dbenv->db_mode, dbenv->lockfhp)) != 0)
 		goto err;
 
 	/*
@@ -230,12 +231,12 @@ loop:	renv = NULL;
 	 * the better.
 	 */
 #ifdef HAVE_MUTEX_THREADS
-	 __os_closehandle(dbenv->lockfhp);
+	 __os_closehandle(dbenv, dbenv->lockfhp);
 #endif
 
 	/* Call the region join routine to acquire the region. */
 	memset(&tregion, 0, sizeof(tregion));
-	tregion.size = size;
+	tregion.size = (roff_t)size;
 	tregion.segid = segid;
 	if ((ret = __os_r_attach(dbenv, infop, &tregion)) != 0)
 		goto err;
@@ -265,7 +266,7 @@ loop:	renv = NULL;
 	 * can't because Windows/NT filesystems won't open files mode 0.
 	 */
 	renv = infop->primary;
-	if (renv->panic) {
+	if (renv->envpanic && !F_ISSET(dbenv, DB_ENV_NOPANIC)) {
 		ret = __db_panic_msg(dbenv);
 		goto err;
 	}
@@ -287,13 +288,13 @@ loop:	renv = NULL;
 	}
 
 	/* Lock the environment. */
-	MUTEX_LOCK(dbenv, &renv->mutex, dbenv->lockfhp);
+	MUTEX_LOCK(dbenv, &renv->mutex);
 
 	/*
 	 * Finally!  We own the environment now.  Repeat the panic check, it's
 	 * possible that it was set while we waited for the lock.
 	 */
-	if (renv->panic) {
+	if (renv->envpanic && !F_ISSET(dbenv, DB_ENV_NOPANIC)) {
 		ret = __db_panic_msg(dbenv);
 		goto err_unlock;
 	}
@@ -338,7 +339,7 @@ err_unlock:	MUTEX_UNLOCK(dbenv, &renv->mutex);
 	 * Fault the pages into memory.  Note, do this AFTER releasing the
 	 * lock, because we're only reading the pages, not writing them.
 	 */
-	(void)__db_faultmem(infop->primary, rp->size, 0);
+	(void)__db_faultmem(dbenv, infop->primary, rp->size, 0);
 
 	/* Everything looks good, we're done. */
 	dbenv->reginfo = infop;
@@ -352,9 +353,12 @@ creation:
 	 * Allocate room for 50 REGION structures plus overhead (we're going
 	 * to use this space for last-ditch allocation requests), although we
 	 * should never need anything close to that.
+	 *
+	 * Encryption passwds are stored in the env region.  Add that in too.
 	 */
 	memset(&tregion, 0, sizeof(tregion));
-	tregion.size = 50 * sizeof(REGION) + 50 * sizeof(MUTEX) + 2048;
+	tregion.size = (roff_t)(50 * sizeof(REGION) +
+	    dbenv->passwd_len + 2048);
 	tregion.segid = INVALID_REGION_SEGID;
 	if ((ret = __os_r_attach(dbenv, infop, &tregion)) != 0)
 		goto err;
@@ -363,7 +367,7 @@ creation:
 	 * Fault the pages into memory.  Note, do this BEFORE we initialize
 	 * anything, because we're writing the pages, not just reading them.
 	 */
-	(void)__db_faultmem(infop->addr, tregion.size, 1);
+	(void)__db_faultmem(dbenv, infop->addr, tregion.size, 1);
 
 	/*
 	 * The first object in the region is the REGENV structure.  This is
@@ -392,10 +396,12 @@ creation:
 	 * number which validates the file/environment.
 	 */
 	renv = infop->primary;
-	renv->panic = 0;
+	renv->envpanic = 0;
 	db_version(&renv->majver, &renv->minver, &renv->patch);
 	SH_LIST_INIT(&renv->regionq);
 	renv->refcnt = 1;
+	renv->cipher_off = INVALID_ROFF;
+	renv->rep_off = INVALID_ROFF;
 
 	/*
 	 * Initialize init_flags to store the flags that any other environment
@@ -412,15 +418,15 @@ creation:
 	 * filesystem as the database home.  But you knew that, I'm sure -- it
 	 * probably wasn't even worth mentioning.)
 	 */
-	if ((ret =
-	    __db_mutex_init(dbenv, &renv->mutex, DB_FCNTL_OFF_GEN, 0)) != 0) {
+	if ((ret = __db_mutex_setup(dbenv, infop, &renv->mutex,
+	    MUTEX_NO_RECORD | MUTEX_NO_RLOCK)) != 0) {
 		__db_err(dbenv, "%s: unable to initialize environment lock: %s",
 		    infop->name, db_strerror(ret));
 		goto err;
 	}
 
 	if (!F_ISSET(&renv->mutex, MUTEX_IGNORE) &&
-	    (ret = __db_mutex_lock(dbenv, &renv->mutex, dbenv->lockfhp)) != 0) {
+	    (ret = __db_mutex_lock(dbenv, &renv->mutex)) != 0) {
 		__db_err(dbenv, "%s: unable to acquire environment lock: %s",
 		    infop->name, db_strerror(ret));
 		goto err;
@@ -459,8 +465,8 @@ find_err:	__db_err(dbenv,
 	if (tregion.segid != INVALID_REGION_SEGID) {
 		ref.size = tregion.size;
 		ref.segid = tregion.segid;
-		if ((ret = __os_write(dbenv, dbenv->lockfhp,
-		    &ref, sizeof(ref), &nrw)) != 0 || nrw != sizeof(ref)) {
+		if ((ret = __os_write(
+		    dbenv, dbenv->lockfhp, &ref, sizeof(ref), &nrw)) != 0) {
 			__db_err(dbenv,
 			    "%s: unable to write out public environment ID: %s",
 			    infop->name, db_strerror(ret));
@@ -476,7 +482,7 @@ find_err:	__db_err(dbenv,
 	 */
 #if defined(HAVE_MUTEX_THREADS)
 	if (F_ISSET(dbenv->lockfhp, DB_FH_VALID))
-		 __os_closehandle(dbenv->lockfhp);
+		 __os_closehandle(dbenv, dbenv->lockfhp);
 #endif
 
 	/* Validate the file. */
@@ -492,7 +498,7 @@ find_err:	__db_err(dbenv,
 err:
 retry:	/* Close any open file handle. */
 	if (F_ISSET(dbenv->lockfhp, DB_FH_VALID))
-		(void)__os_closehandle(dbenv->lockfhp);
+		(void)__os_closehandle(dbenv, dbenv->lockfhp);
 
 	/*
 	 * If we joined or created the region, detach from it.  If we created
@@ -513,8 +519,8 @@ retry:	/* Close any open file handle. */
 
 	/* Free the allocated name and/or REGINFO structure. */
 	if (infop->name != NULL)
-		__os_freestr(infop->name);
-	__os_free(infop, sizeof(REGINFO));
+		__os_free(dbenv, infop->name);
+	__os_free(dbenv, infop);
 
 	/* If we had a temporary error, wait awhile and try again. */
 	if (ret == 0) {
@@ -547,8 +553,10 @@ __db_e_detach(dbenv, destroy)
 	infop = dbenv->reginfo;
 	renv = infop->primary;
 
+	if (F_ISSET(dbenv, DB_ENV_PRIVATE))
+		destroy = 1;
 	/* Lock the environment. */
-	MUTEX_LOCK(dbenv, &renv->mutex, dbenv->lockfhp);
+	MUTEX_LOCK(dbenv, &renv->mutex);
 
 	/* Decrement the reference count. */
 	if (renv->refcnt == 0) {
@@ -563,33 +571,39 @@ __db_e_detach(dbenv, destroy)
 
 	/* Close the locking file handle. */
 	if (F_ISSET(dbenv->lockfhp, DB_FH_VALID))
-		(void)__os_closehandle(dbenv->lockfhp);
+		(void)__os_closehandle(dbenv, dbenv->lockfhp);
 
 	/* Reset the addr value that we "corrected" above. */
 	infop->addr = infop->primary;
 
 	/*
 	 * If we are destroying the environment, we need to
-	 * destroy any system resources backing the mutex.
-	 * Do that now before we free the memory in __os_r_detach.
+	 * destroy any system resources backing the mutex, as well
+	 * as any system resources that the replication system may have
+	 * acquired and put in the main region.
+	 *
+	 * Do these now before we free the memory in __os_r_detach.
 	 */
-	if (destroy)
+	if (destroy) {
+		__rep_region_destroy(dbenv);
 		__db_mutex_destroy(&renv->mutex);
+		__db_mutex_destroy(&infop->rp->mutex);
+	}
 
 	/*
 	 * Release the region, and kill our reference.
 	 *
-	 * We set the DBENV->reginfo field to NULL here and discard its memory.
-	 * DBENV->remove calls __dbenv_remove to do the region remove, and
+	 * We set the DB_ENV->reginfo field to NULL here and discard its memory.
+	 * DB_ENV->remove calls __dbenv_remove to do the region remove, and
 	 * __dbenv_remove attached and then detaches from the region.  We don't
-	 * want to return to DBENV->remove with a non-NULL DBENV->reginfo field
-	 * because it will attempt to detach again as part of its cleanup.
+	 * want to return to DB_ENV->remove with a non-NULL DB_ENV->reginfo
+	 * field because it will attempt to detach again as part of its cleanup.
 	 */
 	(void)__os_r_detach(dbenv, infop, destroy);
 
 	if (infop->name != NULL)
-		__os_free(infop->name, 0);
-	__os_free(dbenv->reginfo, sizeof(REGINFO));
+		__os_free(dbenv, infop->name);
+	__os_free(dbenv, dbenv->reginfo);
 	dbenv->reginfo = NULL;
 
 	return (0);
@@ -599,18 +613,20 @@ __db_e_detach(dbenv, destroy)
  * __db_e_remove --
  *	Discard an environment if it's not in use.
  *
- * PUBLIC: int __db_e_remove __P((DB_ENV *, int));
+ * PUBLIC: int __db_e_remove __P((DB_ENV *, u_int32_t));
  */
 int
-__db_e_remove(dbenv, force)
+__db_e_remove(dbenv, flags)
 	DB_ENV *dbenv;
-	int force;
+	u_int32_t flags;
 {
 	REGENV *renv;
 	REGINFO *infop, reginfo;
 	REGION *rp;
-	int ret;
+	u_int32_t db_env_reset;
+	int force, ret;
 
+	force = LF_ISSET(DB_FORCE) ? 1 : 0;
 	/*
 	 * This routine has to walk a nasty line between not looking into
 	 * the environment (which may be corrupted after an app or system
@@ -632,8 +648,10 @@ __db_e_remove(dbenv, force)
 	 * If the force flag is set, we do not acquire any locks during this
 	 * process.
 	 */
+	db_env_reset = F_ISSET(dbenv, DB_ENV_NOLOCKING | DB_ENV_NOPANIC);
 	if (force)
-		dbenv->db_mutexlocks = 0;
+		F_SET(dbenv, DB_ENV_NOLOCKING);
+	F_SET(dbenv, DB_ENV_NOPANIC);
 
 	/* Join the environment. */
 	if ((ret = __db_e_attach(dbenv, NULL)) != 0) {
@@ -645,17 +663,21 @@ __db_e_remove(dbenv, force)
 		ret = 0;
 		if (force)
 			goto remfiles;
-		goto err;
+		goto done;
 	}
 
 	infop = dbenv->reginfo;
 	renv = infop->primary;
 
 	/* Lock the environment. */
-	MUTEX_LOCK(dbenv, &renv->mutex, dbenv->lockfhp);
+	MUTEX_LOCK(dbenv, &renv->mutex);
 
-	/* If it's in use, we're done. */
-	if (renv->refcnt == 1 || force) {
+	/*
+	 * If it's in use, we're done unless we're forcing the issue or the
+	 * environment has panic'd.  (Presumably, if the environment panic'd,
+	 * the thread holding the reference count may not have cleaned up.)
+	 */
+	if (renv->refcnt == 1 || renv->envpanic == 1 || force) {
 		/*
 		 * Set the panic flag and overwrite the magic number.
 		 *
@@ -663,7 +685,7 @@ __db_e_remove(dbenv, force)
 		 * From this point on, there's no going back, we pretty
 		 * much ignore errors, and just whack on whatever we can.
 		 */
-		renv->panic = 1;
+		renv->envpanic = 1;
 		renv->magic = 0;
 
 		/*
@@ -713,7 +735,7 @@ restart:	for (rp = SH_LIST_FIRST(&renv->regionq, __db_region);
 		/* Destroy the environment's region. */
 		(void)__db_e_detach(dbenv, 1);
 
-		/* Discard the physical files. */
+		/* Discard any remaining physical files. */
 remfiles:	(void)__db_e_remfile(dbenv);
 	} else {
 		/* Unlock the environment. */
@@ -725,7 +747,9 @@ remfiles:	(void)__db_e_remfile(dbenv);
 		ret = EBUSY;
 	}
 
-err:
+done:	F_CLR(dbenv, DB_ENV_NOLOCKING | DB_ENV_NOPANIC);
+	F_SET(dbenv, db_env_reset);
+
 	return (ret);
 }
 
@@ -742,7 +766,7 @@ __db_e_remfile(dbenv)
 		"__db_log.share",
 		"__db_mpool.share",
 		"__db_txn.share",
-		NULL,
+		NULL
 	};
 	int cnt, fcnt, lastrm, ret;
 	u_int8_t saved_byte;
@@ -751,8 +775,7 @@ __db_e_remfile(dbenv)
 
 	/* Get the full path of a file in the environment. */
 	(void)snprintf(buf, sizeof(buf), "%s", DB_REGION_ENV);
-	if ((ret =
-	    __db_appname(dbenv, DB_APP_NONE, NULL, buf, 0, NULL, &path)) != 0)
+	if ((ret = __db_appname(dbenv, DB_APP_NONE, buf, 0, NULL, &path)) != 0)
 		return (ret);
 
 	/* Get the parent directory for the environment. */
@@ -769,16 +792,15 @@ __db_e_remfile(dbenv)
 	}
 
 	/* Get the list of file names. */
-	ret = __os_dirlist(dbenv, dir, &names, &fcnt);
+	if ((ret = __os_dirlist(dbenv, dir, &names, &fcnt)) != 0)
+		__db_err(dbenv, "%s: %s", dir, db_strerror(ret));
 
 	/* Restore the path, and free it. */
 	*p = saved_byte;
-	__os_freestr(path);
+	__os_free(dbenv, path);
 
-	if (ret != 0) {
-		__db_err(dbenv, "%s: %s", dir, db_strerror(ret));
+	if (ret != 0)
 		return (ret);
-	}
 
 	/*
 	 * Search for valid region names, and remove them.  We remove the
@@ -799,19 +821,23 @@ __db_e_remfile(dbenv)
 			continue;
 
 		if (__db_appname(dbenv,
-		    DB_APP_NONE, NULL, names[cnt], 0, NULL, &path) == 0) {
+		    DB_APP_NONE, names[cnt], 0, NULL, &path) == 0) {
+			if (F_ISSET(dbenv, DB_ENV_OVERWRITE))
+				(void)__db_overwrite(dbenv, path);
 			(void)__os_unlink(dbenv, path);
-			__os_freestr(path);
+			__os_free(dbenv, path);
 		}
 	}
 
 	if (lastrm != -1)
 		if (__db_appname(dbenv,
-		    DB_APP_NONE, NULL, names[lastrm], 0, NULL, &path) == 0) {
+		    DB_APP_NONE, names[lastrm], 0, NULL, &path) == 0) {
+			if (F_ISSET(dbenv, DB_ENV_OVERWRITE))
+				(void)__db_overwrite(dbenv, path);
 			(void)__os_unlink(dbenv, path);
-			__os_freestr(path);
+			__os_free(dbenv, path);
 		}
-	__os_dirfree(names, fcnt);
+	__os_dirfree(dbenv, names, fcnt);
 
 	/*
 	 * !!!
@@ -820,9 +846,9 @@ __db_e_remfile(dbenv)
 	 */
 	for (names = (char **)old_region_names; *names != NULL; ++names)
 		if (__db_appname(dbenv,
-		    DB_APP_NONE, NULL, *names, 0, NULL, &path) == 0) {
+		    DB_APP_NONE, *names, 0, NULL, &path) == 0) {
 			(void)__os_unlink(dbenv, path);
-			__os_freestr(path);
+			__os_free(dbenv, path);
 		}
 
 	return (0);
@@ -832,33 +858,47 @@ __db_e_remfile(dbenv)
  * __db_e_stat
  *	Statistics for the environment.
  *
- * PUBLIC: int __db_e_stat __P((DB_ENV *, REGENV *, REGION *, int *));
+ * PUBLIC: int __db_e_stat __P((DB_ENV *,
+ * PUBLIC:       REGENV *, REGION *, int *, u_int32_t));
  */
 int
-__db_e_stat(dbenv, arg_renv, arg_regions, arg_regions_cnt)
+__db_e_stat(dbenv, arg_renv, arg_regions, arg_regions_cnt, flags)
 	DB_ENV *dbenv;
 	REGENV *arg_renv;
 	REGION *arg_regions;
 	int *arg_regions_cnt;
+	u_int32_t flags;
 {
 	REGENV *renv;
 	REGINFO *infop;
 	REGION *rp;
-	int n;
+	int n, ret;
 
 	infop = dbenv->reginfo;
 	renv = infop->primary;
 	rp = infop->rp;
+	if ((ret = __db_fchk(dbenv,
+	    "DB_ENV->stat", flags, DB_STAT_CLEAR)) != 0)
+		return (ret);
 
 	/* Lock the environment. */
-	MUTEX_LOCK(dbenv, &rp->mutex, dbenv->lockfhp);
+	MUTEX_LOCK(dbenv, &rp->mutex);
 
 	*arg_renv = *renv;
+	if (LF_ISSET(DB_STAT_CLEAR)) {
+		renv->mutex.mutex_set_nowait = 0;
+		renv->mutex.mutex_set_wait = 0;
+	}
 
 	for (n = 0, rp = SH_LIST_FIRST(&renv->regionq, __db_region);
 	    n < *arg_regions_cnt && rp != NULL;
-	    ++n, rp = SH_LIST_NEXT(rp, q, __db_region))
+	    ++n, rp = SH_LIST_NEXT(rp, q, __db_region)) {
 		arg_regions[n] = *rp;
+		if (LF_ISSET(DB_STAT_CLEAR)) {
+			rp->mutex.mutex_set_nowait = 0;
+			rp->mutex.mutex_set_wait = 0;
+		}
+	}
 
 	/* Release the lock. */
 	rp = infop->rp;
@@ -887,12 +927,15 @@ __db_r_attach(dbenv, infop, size)
 	char buf[sizeof(DB_REGION_FMT) + 20];
 
 	renv = ((REGINFO *)dbenv->reginfo)->primary;
-	F_CLR(infop, REGION_CREATE);
 
 	/* Lock the environment. */
-	MUTEX_LOCK(dbenv, &renv->mutex, dbenv->lockfhp);
+	MUTEX_LOCK(dbenv, &renv->mutex);
 
-	/* Find or create a REGION structure for this region. */
+	/*
+	 * Find or create a REGION structure for this region.  If we create
+	 * it, the REGION_CREATE flag will be set in the infop structure.
+	 */
+	F_CLR(infop, REGION_CREATE);
 	if ((ret = __db_des_get(dbenv, dbenv->reginfo, infop, &rp)) != 0) {
 		MUTEX_UNLOCK(dbenv, &renv->mutex);
 		return (ret);
@@ -903,12 +946,12 @@ __db_r_attach(dbenv, infop, size)
 
 	/* If we're creating the region, set the desired size. */
 	if (F_ISSET(infop, REGION_CREATE))
-		rp->size = size;
+		rp->size = (roff_t)size;
 
 	/* Join/create the underlying region. */
 	(void)snprintf(buf, sizeof(buf), DB_REGION_FMT, infop->id);
 	if ((ret = __db_appname(dbenv,
-	    DB_APP_NONE, NULL, buf, 0, NULL, &infop->name)) != 0)
+	    DB_APP_NONE, buf, 0, NULL, &infop->name)) != 0)
 		goto err;
 	if ((ret = __os_r_attach(dbenv, infop, rp)) != 0)
 		goto err;
@@ -918,8 +961,8 @@ __db_r_attach(dbenv, infop, size)
 	 * anything because we're writing pages in created regions, not just
 	 * reading them.
 	 */
-	(void)__db_faultmem(infop->addr,
-	    rp->size, F_ISSET(infop, REGION_CREATE));
+	(void)__db_faultmem(dbenv,
+	    infop->addr, rp->size, F_ISSET(infop, REGION_CREATE));
 
 	/*
 	 * !!!
@@ -940,7 +983,7 @@ __db_r_attach(dbenv, infop, size)
 	 * for it and release our lock on the environment.
 	 */
 	if (infop->type != REGION_TYPE_ENV) {
-		MUTEX_LOCK(dbenv, &rp->mutex, dbenv->lockfhp);
+		MUTEX_LOCK(dbenv, &rp->mutex);
 		MUTEX_UNLOCK(dbenv, &renv->mutex);
 	}
 
@@ -954,8 +997,10 @@ err:	if (infop->addr != NULL)
 	infop->id = INVALID_REGION_ID;
 
 	/* Discard the REGION structure if we created it. */
-	if (F_ISSET(infop, REGION_CREATE))
+	if (F_ISSET(infop, REGION_CREATE)) {
 		(void)__db_des_destroy(dbenv, rp);
+		F_CLR(infop, REGION_CREATE);
+	}
 
 	/* Release the environment lock. */
 	MUTEX_UNLOCK(dbenv, &renv->mutex);
@@ -981,12 +1026,14 @@ __db_r_detach(dbenv, infop, destroy)
 
 	renv = ((REGINFO *)dbenv->reginfo)->primary;
 	rp = infop->rp;
+	if (F_ISSET(dbenv, DB_ENV_PRIVATE))
+		destroy = 1;
 
 	/* Lock the environment. */
-	MUTEX_LOCK(dbenv, &renv->mutex, dbenv->lockfhp);
+	MUTEX_LOCK(dbenv, &renv->mutex);
 
 	/* Acquire the lock for the REGION. */
-	MUTEX_LOCK(dbenv, &rp->mutex, dbenv->lockfhp);
+	MUTEX_LOCK(dbenv, &rp->mutex);
 
 	/*
 	 * We need to call destroy on per-subsystem info before
@@ -1011,7 +1058,7 @@ __db_r_detach(dbenv, infop, destroy)
 
 	/* Destroy the structure. */
 	if (infop->name != NULL)
-		__os_freestr(infop->name);
+		__os_free(dbenv, infop->name);
 
 	return (ret);
 }
@@ -1089,9 +1136,8 @@ __db_des_get(dbenv, env_infop, infop, rpp)
 
 		/* Initialize the region. */
 		memset(rp, 0, sizeof(*rp));
-		if ((ret = __db_mutex_init(dbenv, &rp->mutex,
-		    R_OFFSET(env_infop, &rp->mutex) + DB_FCNTL_OFF_GEN,
-		    0)) != 0) {
+		if ((ret = __db_mutex_setup(dbenv, env_infop, &rp->mutex,
+		    MUTEX_NO_RECORD | MUTEX_NO_RLOCK)) != 0) {
 			__db_shalloc_free(env_infop->addr, rp);
 			return (ret);
 		}
@@ -1141,7 +1187,8 @@ __db_des_destroy(dbenv, rp)
  *	Fault the region into memory.
  */
 static int
-__db_faultmem(addr, size, created)
+__db_faultmem(dbenv, addr, size, created)
+	DB_ENV *dbenv;
 	void *addr;
 	size_t size;
 	int created;
@@ -1162,7 +1209,7 @@ __db_faultmem(addr, size, created)
 	 * that it doesn't figure out that we're never really using it.
 	 */
 	ret = 0;
-	if (DB_GLOBAL(db_region_init)) {
+	if (F_ISSET(dbenv, DB_ENV_REGION_INIT)) {
 		if (created)
 			for (p = addr, t = (u_int8_t *)addr + size;
 			    p < t; p += OS_VMPAGESIZE)
@@ -1190,13 +1237,17 @@ __db_region_destroy(dbenv, infop)
 	case REGION_TYPE_LOCK:
 		__lock_region_destroy(dbenv, infop);
 		break;
+	case REGION_TYPE_LOG:
+		__log_region_destroy(dbenv, infop);
+		break;
 	case REGION_TYPE_MPOOL:
 		__mpool_region_destroy(dbenv, infop);
 		break;
+	case REGION_TYPE_TXN:
+		__txn_region_destroy(dbenv, infop);
+		break;
 	case REGION_TYPE_ENV:
-	case REGION_TYPE_LOG:
 	case REGION_TYPE_MUTEX:
-	case REGION_TYPE_TXN:
 		break;
 	default:
 		DB_ASSERT(0);