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

3 files changed, 49 insertions, 193 deletions

diff --git a/bdb/xa/xa.c b/bdb/xa/xa.c
index b13a6d503b3..6667d14c2bf 100644
--- a/bdb/xa/xa.c
+++ b/bdb/xa/xa.c
@@ -1,14 +1,14 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1998, 1999, 2000
+ * Copyright (c) 1998-2002
  *	Sleepycat Software.  All rights reserved.
  */
 
 #include "db_config.h"
 
 #ifndef lint
-static const char revid[] = "$Id: xa.c,v 11.10 2000/12/14 07:39:14 ubell Exp $";
+static const char revid[] = "$Id: xa.c,v 11.23 2002/08/29 14:22:25 margo Exp $";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -19,11 +19,7 @@ static const char revid[] = "$Id: xa.c,v 11.10 2000/12/14 07:39:14 ubell Exp $";
 #endif
 
 #include "db_int.h"
-#include "db_page.h"
-#include "log.h"
-#include "txn.h"
-#include "db_am.h"
-#include "db_dispatch.h"
+#include "dbinc/txn.h"
 
 static int  __db_xa_close __P((char *, int, long));
 static int  __db_xa_commit __P((XID *, int, long));
@@ -35,8 +31,7 @@ static int  __db_xa_prepare __P((XID *, int, long));
 static int  __db_xa_recover __P((XID *, long, int, long));
 static int  __db_xa_rollback __P((XID *, int, long));
 static int  __db_xa_start __P((XID *, int, long));
-static void __xa_txn_end __P((DB_ENV *));
-static void __xa_txn_init __P((DB_ENV *, TXN_DETAIL *, size_t));
+static void __xa_txn_end __P((DB_TXN *));
 
 /*
  * Possible flag values:
@@ -158,7 +153,7 @@ __db_xa_close(xa_info, rmid, flags)
 
 	/* Discard space held for the current transaction. */
 	if (env->xa_txn != NULL)
-		__os_free(env->xa_txn, sizeof(DB_TXN));
+		__os_free(env, env->xa_txn);
 
 	/* Close the environment. */
 	if ((t_ret = env->close(env, 0)) != 0 && ret == 0)
@@ -220,7 +215,7 @@ __db_xa_start(xid, rmid, flags)
 			return (XA_RBOTHER);
 
 		/* Now, fill in the global transaction structure. */
-		__xa_txn_init(env, td, off);
+		__txn_continue(env, env->xa_txn, td, off);
 		td->xa_status = TXN_XA_STARTED;
 	} else {
 		if (__txn_xa_begin(env, env->xa_txn) != 0)
@@ -327,15 +322,15 @@ __db_xa_prepare(xid, rmid, flags)
 		return (XAER_PROTO);
 
 	/* Now, fill in the global transaction structure. */
-	__xa_txn_init(env, td, off);
+	__txn_continue(env, env->xa_txn, td, off);
 
-	if (txn_prepare(env->xa_txn) != 0)
+	if (env->xa_txn->prepare(env->xa_txn, (u_int8_t *)xid->data) != 0)
 		return (XAER_RMERR);
 
 	td->xa_status = TXN_XA_PREPARED;
 
 	/* No fatal value that would require an XAER_RMFAIL. */
-	__xa_txn_end(env);
+	__xa_txn_end(env->xa_txn);
 	return (XA_OK);
 }
 
@@ -385,13 +380,13 @@ __db_xa_commit(xid, rmid, flags)
 		return (XAER_PROTO);
 
 	/* Now, fill in the global transaction structure. */
-	__xa_txn_init(env, td, off);
+	__txn_continue(env, env->xa_txn, td, off);
 
-	if (txn_commit(env->xa_txn, 0) != 0)
+	if (env->xa_txn->commit(env->xa_txn, 0) != 0)
 		return (XAER_RMERR);
 
 	/* No fatal value that would require an XAER_RMFAIL. */
-	__xa_txn_end(env);
+	__xa_txn_end(env->xa_txn);
 	return (XA_OK);
 }
 
@@ -409,118 +404,26 @@ __db_xa_recover(xids, count, rmid, flags)
 	long count, flags;
 	int rmid;
 {
-	__txn_xa_regop_args *argp;
-	DBT data;
 	DB_ENV *env;
-	DB_LOG *log;
-	XID *xidp;
-	int err, ret;
-	u_int32_t rectype, txnid;
-
-	ret = 0;
-	xidp = xids;
+	u_int32_t newflags;
+	long rval;
 
 	/* If the environment is closed, then we're done. */
 	if (__db_rmid_to_env(rmid, &env) != 0)
 		return (XAER_PROTO);
 
-	/*
-	 * If we are starting a scan, then we need to figure out where
-	 * to begin.  If we are not starting a scan, we'll start from
-	 * wherever the log cursor is.  Since XA apps cannot be threaded,
-	 * we don't have to worry about someone else having moved it.
-	 */
-	log = env->lg_handle;
-	if (LF_ISSET(TMSTARTRSCAN)) {
-		if ((err = __log_findckp(env, &log->xa_first)) == DB_NOTFOUND) {
-			/*
-			 * If there were no log files, then we have no
-			 * transactions to return, so we simply return 0.
-			 */
-			return (0);
-		}
-		if ((err = __db_txnlist_init(env, &log->xa_info)) != 0)
-			return (XAER_RMERR);
-	} else {
-		/*
-		 * If we are not starting a scan, the log cursor had
-		 * better be set.
-		 */
-		if (IS_ZERO_LSN(log->xa_lsn))
-			return (XAER_PROTO);
-	}
-
-	/*
-	 * At this point log->xa_first contains the point in the log
-	 * to which we need to roll back.  If we are starting a scan,
-	 * we'll start at the last record; if we're continuing a scan,
-	 * we'll have to start at log->xa_lsn.
-	 */
-
-	memset(&data, 0, sizeof(data));
-	for (err = log_get(env, &log->xa_lsn, &data,
-	    LF_ISSET(TMSTARTRSCAN) ? DB_LAST : DB_SET);
-	    err == 0 && log_compare(&log->xa_lsn, &log->xa_first) > 0;
-	    err = log_get(env, &log->xa_lsn, &data, DB_PREV)) {
-		memcpy(&rectype, data.data, sizeof(rectype));
-
-		/*
-		 * The only record type we care about is an DB_txn_xa_regop.
-		 * If it's a commit, we have to add it to a txnlist.  If it's
-		 * a prepare, and we don't have a commit, then we return it.
-		 * We are redoing some of what's in the xa_regop_recovery
-		 * code, but we have to do it here so we can get at the xid
-		 * in the record.
-		 */
-		if (rectype != DB_txn_xa_regop && rectype != DB_txn_regop)
-			continue;
-
-		memcpy(&txnid, (u_int8_t *)data.data + sizeof(rectype),
-		    sizeof(txnid));
-		err = __db_txnlist_find(log->xa_info, txnid);
-		switch (rectype) {
-		case DB_txn_regop:
-			if (err == DB_NOTFOUND)
-				__db_txnlist_add(env, log->xa_info, txnid, 0);
-			err = 0;
-			break;
-		case DB_txn_xa_regop:
-			/*
-			 * This transaction is committed, so we needn't read
-			 * the record and do anything.
-			 */
-			if (err == 0)
-				break;
-			if ((err =
-			    __txn_xa_regop_read(env, data.data, &argp)) != 0) {
-				ret = XAER_RMERR;
-				goto out;
-			}
-
-			xidp->formatID = argp->formatID;
-			xidp->gtrid_length = argp->gtrid;
-			xidp->bqual_length = argp->bqual;
-			memcpy(xidp->data, argp->xid.data, argp->xid.size);
-			ret++;
-			xidp++;
-			__os_free(argp, sizeof(*argp));
-			if (ret == count)
-				goto done;
-			break;
-		}
-	}
-
-	if (err != 0 && err != DB_NOTFOUND)
-		goto out;
-
-done:	if (LF_ISSET(TMENDRSCAN)) {
-		ZERO_LSN(log->xa_lsn);
-		ZERO_LSN(log->xa_first);
+	if (LF_ISSET(TMSTARTRSCAN))
+		newflags = DB_FIRST;
+	else if (LF_ISSET(TMENDRSCAN))
+		newflags = DB_LAST;
+	else
+		newflags = DB_NEXT;
 
-out:		__db_txnlist_end(env, log->xa_info);
-		log->xa_info = NULL;
-	}
-	return (ret);
+	rval = 0;
+	if (__txn_get_prepared(env, xids, NULL, count, &rval, newflags) != 0)
+		return (XAER_RMERR);
+	else
+		return (rval);
 }
 
 /*
@@ -560,12 +463,12 @@ __db_xa_rollback(xid, rmid, flags)
 		return (XAER_PROTO);
 
 	/* Now, fill in the global transaction structure. */
-	__xa_txn_init(env, td, off);
-	if (txn_abort(env->xa_txn) != 0)
+	__txn_continue(env, env->xa_txn, td, off);
+	if (env->xa_txn->abort(env->xa_txn) != 0)
 		return (XAER_RMERR);
 
 	/* No fatal value that would require an XAER_RMFAIL. */
-	__xa_txn_end(env);
+	__xa_txn_end(env->xa_txn);
 	return (XA_OK);
 }
 
@@ -624,38 +527,13 @@ __db_xa_complete(handle, retval, rmid, flags)
 }
 
 /*
- * __xa_txn_init --
- *	Fill in the fields of the local transaction structure given
- *	the detail transaction structure.
- */
-static void
-__xa_txn_init(env, td, off)
-	DB_ENV *env;
-	TXN_DETAIL *td;
-	size_t off;
-{
-	DB_TXN *txn;
-
-	txn = env->xa_txn;
-	txn->mgrp = env->tx_handle;
-	txn->parent = NULL;
-	txn->last_lsn = td->last_lsn;
-	txn->txnid = td->txnid;
-	txn->off = off;
-	txn->flags = 0;
-}
-
-/*
  * __xa_txn_end --
- *	Invalidate a transaction structure that was generated by xa_txn_init.
+ *	Invalidate a transaction structure that was generated by __txn_continue.
  */
 static void
-__xa_txn_end(env)
-	DB_ENV *env;
-{
+__xa_txn_end(txn)
 	DB_TXN *txn;
-
-	txn = env->xa_txn;
+{
 	if (txn != NULL)
 		txn->txnid = TXN_INVALID;
 }
diff --git a/bdb/xa/xa_db.c b/bdb/xa/xa_db.c
index ba3dbfeddbb..b84bb1c9fa9 100644
--- a/bdb/xa/xa_db.c
+++ b/bdb/xa/xa_db.c
@@ -1,14 +1,14 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1998, 1999, 2000
+ * Copyright (c) 1998-2002
  *	Sleepycat Software.  All rights reserved.
  */
 
 #include "db_config.h"
 
 #ifndef lint
-static const char revid[] = "$Id: xa_db.c,v 11.9 2000/09/06 18:57:59 ubell Exp $";
+static const char revid[] = "$Id: xa_db.c,v 11.21 2002/08/29 14:22:25 margo Exp $";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -16,15 +16,14 @@ static const char revid[] = "$Id: xa_db.c,v 11.9 2000/09/06 18:57:59 ubell Exp $
 #endif
 
 #include "db_int.h"
-#include "xa.h"
-#include "xa_ext.h"
-#include "txn.h"
+#include "dbinc/xa.h"
+#include "dbinc/txn.h"
 
 static int __xa_close __P((DB *, u_int32_t));
 static int __xa_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
 static int __xa_del __P((DB *, DB_TXN *, DBT *, u_int32_t));
 static int __xa_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-static int __xa_open __P((DB *,
+static int __xa_open __P((DB *, DB_TXN *,
 	    const char *, const char *, DBTYPE, u_int32_t, int));
 static int __xa_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
 
@@ -33,7 +32,7 @@ typedef struct __xa_methods {
 	int (*cursor) __P((DB *, DB_TXN *, DBC **, u_int32_t));
 	int (*del) __P((DB *, DB_TXN *, DBT *, u_int32_t));
 	int (*get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-	int (*open) __P((DB *,
+	int (*open) __P((DB *, DB_TXN *,
 	    const char *, const char *, DBTYPE, u_int32_t, int));
 	int (*put) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
 } XA_METHODS;
@@ -73,8 +72,9 @@ __db_xa_create(dbp)
  */
 
 static int
-__xa_open(dbp, name, subdb, type, flags, mode)
+__xa_open(dbp, txn, name, subdb, type, flags, mode)
 	DB *dbp;
+	DB_TXN *txn;
 	const char *name, *subdb;
 	DBTYPE type;
 	u_int32_t flags;
@@ -85,7 +85,7 @@ __xa_open(dbp, name, subdb, type, flags, mode)
 
 	xam = (XA_METHODS *)dbp->xa_internal;
 
-	if ((ret = xam->open(dbp, name, subdb, type, flags, mode)) != 0)
+	if ((ret = xam->open(dbp, txn, name, subdb, type, flags, mode)) != 0)
 		return (ret);
 
 	xam->cursor = dbp->cursor;
@@ -109,7 +109,7 @@ __xa_cursor(dbp, txn, dbcp, flags)
 {
 	DB_TXN *t;
 
-	t = txn != NULL && txn == dbp->open_txn ? txn : dbp->dbenv->xa_txn;
+	t = txn != NULL ? txn : dbp->dbenv->xa_txn;
 	if (t->txnid == TXN_INVALID)
 		t = NULL;
 
@@ -125,7 +125,7 @@ __xa_del(dbp, txn, key, flags)
 {
 	DB_TXN *t;
 
-	t = txn != NULL && txn == dbp->open_txn ? txn : dbp->dbenv->xa_txn;
+	t = txn != NULL ? txn : dbp->dbenv->xa_txn;
 	if (t->txnid == TXN_INVALID)
 		t = NULL;
 
@@ -141,7 +141,7 @@ __xa_close(dbp, flags)
 
 	real_close = ((XA_METHODS *)dbp->xa_internal)->close;
 
-	__os_free(dbp->xa_internal, sizeof(XA_METHODS));
+	__os_free(dbp->dbenv, dbp->xa_internal);
 	dbp->xa_internal = NULL;
 
 	return (real_close(dbp, flags));
@@ -156,7 +156,7 @@ __xa_get(dbp, txn, key, data, flags)
 {
 	DB_TXN *t;
 
-	t = txn != NULL && txn == dbp->open_txn ? txn : dbp->dbenv->xa_txn;
+	t = txn != NULL ? txn : dbp->dbenv->xa_txn;
 	if (t->txnid == TXN_INVALID)
 		t = NULL;
 
@@ -173,7 +173,7 @@ __xa_put(dbp, txn, key, data, flags)
 {
 	DB_TXN *t;
 
-	t = txn != NULL && txn == dbp->open_txn ? txn : dbp->dbenv->xa_txn;
+	t = txn != NULL ? txn : dbp->dbenv->xa_txn;
 	if (t->txnid == TXN_INVALID)
 		t = NULL;
 
diff --git a/bdb/xa/xa_map.c b/bdb/xa/xa_map.c
index 1af268477db..42fa4b20ed2 100644
--- a/bdb/xa/xa_map.c
+++ b/bdb/xa/xa_map.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: xa_map.c,v 11.5 2000/11/30 00:58:46 ubell Exp $";
+static const char revid[] = "$Id: xa_map.c,v 11.19 2002/09/03 14:58:27 sue Exp $";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -18,7 +18,7 @@ static const char revid[] = "$Id: xa_map.c,v 11.5 2000/11/30 00:58:46 ubell Exp
 #endif
 
 #include "db_int.h"
-#include "txn.h"
+#include "dbinc/txn.h"
 
 /*
  * This file contains all the mapping information that we need to support
@@ -72,31 +72,9 @@ __db_xid_to_txn(dbenv, xid, offp)
 	XID *xid;
 	size_t *offp;
 {
-	DB_TXNMGR *mgr;
-	DB_TXNREGION *tmr;
 	struct __txn_detail *td;
 
-	mgr = dbenv->tx_handle;
-	tmr = mgr->reginfo.primary;
-
-	/*
-	 * Search the internal active transaction table to find the
-	 * matching xid.  If this is a performance hit, then we
-	 * can create a hash table, but I doubt it's worth it.
-	 */
-	R_LOCK(dbenv, &mgr->reginfo);
-	for (td = SH_TAILQ_FIRST(&tmr->active_txn, __txn_detail);
-	    td != NULL;
-	    td = SH_TAILQ_NEXT(td, links, __txn_detail))
-		if (memcmp(xid->data, td->xid, XIDDATASIZE) == 0)
-			break;
-	R_UNLOCK(dbenv, &mgr->reginfo);
-
-	if (td == NULL)
-		return (EINVAL);
-
-	*offp = R_OFFSET(&mgr->reginfo, td);
-	return (0);
+	return (__txn_map_gid(dbenv, (u_int8_t *)xid->data, &td, offp));
 }
 
 /*