Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1

into mysql.r18.ru:/usr/home/ram/mysql-4.1

acinclude.m4

@@ -1062,24 +1062,28 @@ AC_DEFUN([MYSQL_CHECK_BDB_VERSION], [
   test -z "$db_patch" && db_patch=0
 
   # This is ugly, but about as good as it can get
-  mysql_bdb=
-  if test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -eq 3
-  then
-    mysql_bdb=h
-  elif test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -eq 9
-  then
-    want_bdb_version="3.2.9a"	# hopefully this will stay up-to-date
-    mysql_bdb=a
-  fi
-
-  if test -n "$mysql_bdb" && \
-	grep "DB_VERSION_STRING.*:.*$mysql_bdb: " [$1] > /dev/null
-  then
-    bdb_version_ok=yes
-  else
-    bdb_version_ok="invalid version $db_major.$db_minor.$db_patch"
-    bdb_version_ok="$bdb_version_ok (must be version 3.2.3h or $want_bdb_version)"
-  fi
+#  mysql_bdb=
+#  if test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -eq 3
+#  then
+#    mysql_bdb=h
+#  elif test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -eq 9
+#  then
+#    want_bdb_version="3.2.9a"	# hopefully this will stay up-to-date
+#    mysql_bdb=a
+#  fi
+
+dbl RAM:
+want_bdb_version="4.1.24"
+bdb_version_ok=yes
+
+#  if test -n "$mysql_bdb" && \
+#	grep "DB_VERSION_STRING.*:.*$mysql_bdb: " [$1] > /dev/null
+#  then
+#    bdb_version_ok=yes
+#  else
+#    bdb_version_ok="invalid version $db_major.$db_minor.$db_patch"
+#    bdb_version_ok="$bdb_version_ok (must be version 3.2.3h or $want_bdb_version)"
+#  fi
 ])
 
 AC_DEFUN([MYSQL_TOP_BUILDDIR], [

bdb/LICENSE

 /*-
- * $Id: LICENSE,v 11.7 2000/11/01 20:35:49 bostic Exp $
+ * $Id: LICENSE,v 11.9 2002/01/11 15:51:10 bostic Exp $
  */
 
 The following is the license that applies to this copy of the Berkeley DB
@@ -10,7 +10,7 @@ Web at http://www.sleepycat.com.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 /*
- * Copyright (c) 1990-2000
+ * Copyright (c) 1990-2002
  *	Sleepycat Software.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

bdb/btree/bt_compare.c

 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997, 1998, 1999, 2000
+ * Copyright (c) 1996-2002
  *	Sleepycat Software.  All rights reserved.
  */
 /*
@@ -43,7 +43,7 @@
 #include "db_config.h"
 
 #ifndef lint
-static const char revid[] = "$Id: bt_compare.c,v 11.12 2000/10/26 19:00:28 krinsky Exp $";
+static const char revid[] = "$Id: bt_compare.c,v 11.17 2002/03/27 04:30:42 bostic Exp $";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -51,8 +51,8 @@ static const char revid[] = "$Id: bt_compare.c,v 11.12 2000/10/26 19:00:28 krins
 #endif
 
 #include "db_int.h"
-#include "db_page.h"
-#include "btree.h"
+#include "dbinc/db_page.h"
+#include "dbinc/btree.h"
 
 /*
  * __bam_cmp --
@@ -92,7 +92,7 @@ __bam_cmp(dbp, dbt, h, indx, func, cmpp)
 	case P_LBTREE:
 	case P_LDUP:
 	case P_LRECNO:
-		bk = GET_BKEYDATA(h, indx);
+		bk = GET_BKEYDATA(dbp, h, indx);
 		if (B_TYPE(bk->type) == B_OVERFLOW)
 			bo = (BOVERFLOW *)bk;
 		else {
@@ -125,7 +125,7 @@ __bam_cmp(dbp, dbt, h, indx, func, cmpp)
 			return (0);
 		}
 
-		bi = GET_BINTERNAL(h, indx);
+		bi = GET_BINTERNAL(dbp, h, indx);
 		if (B_TYPE(bi->type) == B_OVERFLOW)
 			bo = (BOVERFLOW *)(bi->data);
 		else {
@@ -136,7 +136,7 @@ __bam_cmp(dbp, dbt, h, indx, func, cmpp)
 		}
 		break;
 	default:
-		return (__db_pgfmt(dbp, PGNO(h)));
+		return (__db_pgfmt(dbp->dbenv, PGNO(h)));
 	}
 
 	/*

bdb/btree/bt_conv.c

 /*-
  * 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: bt_conv.c,v 11.6 2000/03/31 00:30:26 ubell Exp $";
+static const char revid[] = "$Id: bt_conv.c,v 11.13 2002/08/06 06:11:12 bostic Exp $";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -16,20 +16,21 @@ static const char revid[] = "$Id: bt_conv.c,v 11.6 2000/03/31 00:30:26 ubell Exp
 #endif
 
 #include "db_int.h"
-#include "db_page.h"
-#include "db_swap.h"
-#include "btree.h"
+#include "dbinc/db_page.h"
+#include "dbinc/db_swap.h"
+#include "dbinc/btree.h"
 
 /*
  * __bam_pgin --
  *	Convert host-specific page layout from the host-independent format
  *	stored on disk.
  *
- * PUBLIC: int __bam_pgin __P((DB_ENV *, db_pgno_t, void *, DBT *));
+ * PUBLIC: int __bam_pgin __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
  */
 int
-__bam_pgin(dbenv, pg, pp, cookie)
+__bam_pgin(dbenv, dummydbp, pg, pp, cookie)
 	DB_ENV *dbenv;
+	DB *dummydbp;
 	db_pgno_t pg;
 	void *pp;
 	DBT *cookie;
@@ -38,12 +39,12 @@ __bam_pgin(dbenv, pg, pp, cookie)
 	PAGE *h;
 
 	pginfo = (DB_PGINFO *)cookie->data;
-	if (!pginfo->needswap)
+	if (!F_ISSET(pginfo, DB_AM_SWAP))
 		return (0);
 
 	h = pp;
 	return (TYPE(h) == P_BTREEMETA ?  __bam_mswap(pp) :
-	     __db_byteswap(dbenv, pg, pp, pginfo->db_pagesize, 1));
+	    __db_byteswap(dbenv, dummydbp, pg, pp, pginfo->db_pagesize, 1));
 }
 
 /*
@@ -51,11 +52,12 @@ __bam_pgin(dbenv, pg, pp, cookie)
  *	Convert host-specific page layout to the host-independent format
  *	stored on disk.
  *
- * PUBLIC: int __bam_pgout __P((DB_ENV *, db_pgno_t, void *, DBT *));
+ * PUBLIC: int __bam_pgout __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
  */
 int
-__bam_pgout(dbenv, pg, pp, cookie)
+__bam_pgout(dbenv, dummydbp, pg, pp, cookie)
 	DB_ENV *dbenv;
+	DB *dummydbp;
 	db_pgno_t pg;
 	void *pp;
 	DBT *cookie;
@@ -64,12 +66,12 @@ __bam_pgout(dbenv, pg, pp, cookie)
 	PAGE *h;
 
 	pginfo = (DB_PGINFO *)cookie->data;
-	if (!pginfo->needswap)
+	if (!F_ISSET(pginfo, DB_AM_SWAP))
 		return (0);
 
 	h = pp;
 	return (TYPE(h) == P_BTREEMETA ?  __bam_mswap(pp) :
-	    __db_byteswap(dbenv, pg, pp, pginfo->db_pagesize, 0));
+	    __db_byteswap(dbenv, dummydbp, pg, pp, pginfo->db_pagesize, 0));
 }
 
 /*
@@ -93,6 +95,8 @@ __bam_mswap(pg)
 	SWAP32(p);		/* re_len */
 	SWAP32(p);		/* re_pad */
 	SWAP32(p);		/* root */
+	p += 92 * sizeof(u_int32_t); /* unused */
+	SWAP32(p);		/* crypto_magic */
 
 	return (0);
 }

bdb/btree/bt_curadj.c

 /*-
  * 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: bt_curadj.c,v 11.20 2001/01/17 16:15:49 bostic Exp $";
+static const char revid[] = "$Id: bt_curadj.c,v 11.30 2002/07/03 19:03:48 bostic Exp $";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -16,9 +16,8 @@ static const char revid[] = "$Id: bt_curadj.c,v 11.20 2001/01/17 16:15:49 bostic
 #endif
 
 #include "db_int.h"
-#include "db_page.h"
-#include "btree.h"
-#include "txn.h"
+#include "dbinc/db_page.h"
+#include "dbinc/btree.h"
 
 static int __bam_opd_cursor __P((DB *, DBC *, db_pgno_t, u_int32_t, u_int32_t));
 
@@ -203,10 +202,9 @@ __bam_ca_di(my_dbc, pgno, indx, adjust)
 	}
 	MUTEX_THREAD_UNLOCK(dbenv, dbenv->dblist_mutexp);
 
-	if (found != 0 && DB_LOGGING(my_dbc)) {
-		if ((ret = __bam_curadj_log(dbenv,
-		    my_dbc->txn, &lsn, 0, dbp->log_fileid,
-		    DB_CA_DI, pgno, 0, 0, adjust, indx, 0)) != 0)
+	if (found != 0 && DBC_LOGGING(my_dbc)) {
+		if ((ret = __bam_curadj_log(dbp, my_dbc->txn,
+		    &lsn, 0, DB_CA_DI, pgno, 0, 0, adjust, indx, 0)) != 0)
 			return (ret);
 	}
 
@@ -234,8 +232,13 @@ __bam_opd_cursor(dbp, dbc, first, tpgno, ti)
 	 * Allocate a new cursor and create the stack.  If duplicates
 	 * are sorted, we've just created an off-page duplicate Btree.
 	 * If duplicates aren't sorted, we've just created a Recno tree.
+	 *
+	 * Note that in order to get here at all, there shouldn't be
+	 * an old off-page dup cursor--to augment the checking db_c_newopd
+	 * will do, assert this.
 	 */
-	if ((ret = __db_c_newopd(dbc, tpgno, &dbc_nopd)) != 0)
+	DB_ASSERT(orig_cp->opd == NULL);
+	if ((ret = __db_c_newopd(dbc, tpgno, orig_cp->opd, &dbc_nopd)) != 0)
 		return (ret);
 
 	cp = (BTREE_CURSOR *)dbc_nopd->internal;
@@ -321,17 +324,16 @@ loop:		MUTEX_THREAD_LOCK(dbenv, dbp->mutexp);
 				return (ret);
 			if (my_txn != NULL && dbc->txn != my_txn)
 				found = 1;
-			/* We released the MUTEX to get a cursor, start over. */
+			/* We released the mutex to get a cursor, start over. */
 			goto loop;
 		}
 		MUTEX_THREAD_UNLOCK(dbenv, dbp->mutexp);
 	}
 	MUTEX_THREAD_UNLOCK(dbenv, dbenv->dblist_mutexp);
 
-	if (found != 0 && DB_LOGGING(my_dbc)) {
-		if ((ret = __bam_curadj_log(dbenv,
-		    my_dbc->txn, &lsn, 0, dbp->log_fileid,
-		    DB_CA_DUP, fpgno, tpgno, 0, first, fi, ti)) != 0)
+	if (found != 0 && DBC_LOGGING(my_dbc)) {
+		if ((ret = __bam_curadj_log(dbp, my_dbc->txn,
+		    &lsn, 0, DB_CA_DUP, fpgno, tpgno, 0, first, fi, ti)) != 0)
 			return (ret);
 	}
 	return (0);
@@ -372,8 +374,16 @@ loop:		MUTEX_THREAD_LOCK(dbenv, dbp->mutexp);
 		    dbc != NULL; dbc = TAILQ_NEXT(dbc, links)) {
 			orig_cp = (BTREE_CURSOR *)dbc->internal;
 
+			/*
+			 * A note on the orig_cp->opd != NULL requirement here:
+			 * it's possible that there's a cursor that refers to
+			 * the same duplicate set, but which has no opd cursor,
+			 * because it refers to a different item and we took
+			 * care of it while processing a previous record.
+			 */
 			if (orig_cp->pgno != fpgno ||
 			    orig_cp->indx != first ||
+			    orig_cp->opd == NULL ||
 			    ((BTREE_CURSOR *)orig_cp->opd->internal)->indx
 			    != ti)
 				continue;
@@ -383,7 +393,7 @@ loop:		MUTEX_THREAD_LOCK(dbenv, dbp->mutexp);
 			orig_cp->opd = NULL;
 			orig_cp->indx = fi;
 			/*
-			 * We released the MUTEX to free a cursor,
+			 * We released the mutex to free a cursor,
 			 * start over.
 			 */
 			goto loop;
@@ -440,10 +450,9 @@ __bam_ca_rsplit(my_dbc, fpgno, tpgno)
 	}
 	MUTEX_THREAD_UNLOCK(dbenv, dbenv->dblist_mutexp);
 
-	if (found != 0 && DB_LOGGING(my_dbc)) {
-		if ((ret = __bam_curadj_log(dbenv,
-		    my_dbc->txn, &lsn, 0, dbp->log_fileid,
-		    DB_CA_RSPLIT, fpgno, tpgno, 0, 0, 0, 0)) != 0)
+	if (found != 0 && DBC_LOGGING(my_dbc)) {
+		if ((ret = __bam_curadj_log(dbp, my_dbc->txn,
+		    &lsn, 0, DB_CA_RSPLIT, fpgno, tpgno, 0, 0, 0, 0)) != 0)
 			return (ret);
 	}
 	return (0);
@@ -512,9 +521,9 @@ __bam_ca_split(my_dbc, ppgno, lpgno, rpgno, split_indx, cleft)
 	}
 	MUTEX_THREAD_UNLOCK(dbenv, dbenv->dblist_mutexp);
 
-	if (found != 0 && DB_LOGGING(my_dbc)) {
-		if ((ret = __bam_curadj_log(dbenv, my_dbc->txn,
-		    &lsn, 0, dbp->log_fileid, DB_CA_SPLIT, ppgno, rpgno,
+	if (found != 0 && DBC_LOGGING(my_dbc)) {
+		if ((ret = __bam_curadj_log(dbp,
+		    my_dbc->txn, &lsn, 0, DB_CA_SPLIT, ppgno, rpgno,
 		    cleft ? lpgno : PGNO_INVALID, 0, split_indx, 0)) != 0)
 			return (ret);
 	}

bdb/btree/bt_method.c

 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1999, 2000
+ * Copyright (c) 1999-2002
  *	Sleepycat Software.  All rights reserved.
  */
 
 #include "db_config.h"
 
 #ifndef lint
-static const char revid[] = "$Id: bt_method.c,v 11.20 2000/11/30 00:58:28 ubell Exp $";
+static const char revid[] = "$Id: bt_method.c,v 11.29 2002/04/21 13:17:04 margo Exp $";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -16,9 +16,9 @@ static const char revid[] = "$Id: bt_method.c,v 11.20 2000/11/30 00:58:28 ubell
 #endif
 
 #include "db_int.h"
-#include "db_page.h"
-#include "btree.h"
-#include "qam.h"
+#include "dbinc/db_page.h"
+#include "dbinc/btree.h"
+#include "dbinc/qam.h"
 
 static int __bam_set_bt_compare
 	       __P((DB *, int (*)(DB *, const DBT *, const DBT *)));
@@ -82,7 +82,8 @@ __bam_db_close(dbp)
 {
 	BTREE *t;
 
-	t = dbp->bt_internal;
+	if ((t = dbp->bt_internal) == NULL)
+		return (0);
 						/* Recno */
 	/* Close any backing source file descriptor. */
 	if (t->re_fp != NULL)
@@ -90,9 +91,9 @@ __bam_db_close(dbp)
 
 	/* Free any backing source file name. */
 	if (t->re_source != NULL)
-		__os_freestr(t->re_source);
+		__os_free(dbp->dbenv, t->re_source);
 
-	__os_free(t, sizeof(BTREE));
+	__os_free(dbp->dbenv, t);
 	dbp->bt_internal = NULL;
 
 	return (0);
@@ -127,7 +128,7 @@ __bam_set_flags(dbp, flagsp)
 
 		if (LF_ISSET(DB_DUP | DB_DUPSORT)) {
 			/* DB_DUP/DB_DUPSORT is incompatible with DB_RECNUM. */
-			if (F_ISSET(dbp, DB_BT_RECNUM))
+			if (F_ISSET(dbp, DB_AM_RECNUM))
 				goto incompat;
 
 			if (LF_ISSET(DB_DUPSORT)) {
@@ -145,12 +146,12 @@ __bam_set_flags(dbp, flagsp)
 			if (F_ISSET(dbp, DB_AM_DUP))
 				goto incompat;
 
-			F_SET(dbp, DB_BT_RECNUM);
+			F_SET(dbp, DB_AM_RECNUM);
 			LF_CLR(DB_RECNUM);
 		}
 
 		if (LF_ISSET(DB_REVSPLITOFF)) {
-			F_SET(dbp, DB_BT_REVSPLIT);
+			F_SET(dbp, DB_AM_REVSPLITOFF);
 			LF_CLR(DB_REVSPLITOFF);
 		}
 
@@ -279,12 +280,12 @@ __ram_set_flags(dbp, flagsp)
 		DB_ILLEGAL_METHOD(dbp, DB_OK_RECNO);
 
 		if (LF_ISSET(DB_RENUMBER)) {
-			F_SET(dbp, DB_RE_RENUMBER);
+			F_SET(dbp, DB_AM_RENUMBER);
 			LF_CLR(DB_RENUMBER);
 		}
 
 		if (LF_ISSET(DB_SNAPSHOT)) {
-			F_SET(dbp, DB_RE_SNAPSHOT);
+			F_SET(dbp, DB_AM_SNAPSHOT);
 			LF_CLR(DB_SNAPSHOT);
 		}
 
@@ -310,7 +311,7 @@ __ram_set_re_delim(dbp, re_delim)
 	t = dbp->bt_internal;
 
 	t->re_delim = re_delim;
-	F_SET(dbp, DB_RE_DELIMITER);
+	F_SET(dbp, DB_AM_DELIMITER);
 
 	return (0);
 }
@@ -336,7 +337,7 @@ __ram_set_re_len(dbp, re_len)
 	q = dbp->q_internal;
 	q->re_len = re_len;
 
-	F_SET(dbp, DB_RE_FIXEDLEN);
+	F_SET(dbp, DB_AM_FIXEDLEN);
 
 	return (0);
 }
@@ -362,7 +363,7 @@ __ram_set_re_pad(dbp, re_pad)
 	q = dbp->q_internal;
 	q->re_pad = re_pad;
 
-	F_SET(dbp, DB_RE_PAD);
+	F_SET(dbp, DB_AM_PAD);
 
 	return (0);
 }

bdb/btree/bt_reclaim.c

 /*-
  * 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: bt_reclaim.c,v 11.5 2000/03/22 04:21:01 ubell Exp $";
+static const char revid[] = "$Id: bt_reclaim.c,v 11.11 2002/03/29 20:46:26 bostic Exp $";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -18,10 +18,8 @@ static const char revid[] = "$Id: bt_reclaim.c,v 11.5 2000/03/22 04:21:01 ubell
 #endif
 
 #include "db_int.h"
-#include "db_page.h"
-#include "db_shash.h"
-#include "lock.h"
-#include "btree.h"
+#include "dbinc/db_page.h"
+#include "dbinc/btree.h"
 
 /*
  * __bam_reclaim --
@@ -51,3 +49,38 @@ __bam_reclaim(dbp, txn)
 
 	return (ret);
 }
+
+/*
+ * __bam_truncate --
+ *	Truncate a database.
+ *
+ * PUBLIC: int __bam_truncate __P((DB *, DB_TXN *, u_int32_t *));
+ */
+int
+__bam_truncate(dbp, txn, countp)
+	DB *dbp;
+	DB_TXN *txn;
+	u_int32_t *countp;
+{
+	DBC *dbc;
+	db_trunc_param trunc;
+	int ret, t_ret;
+
+	/* Acquire a cursor. */
+	if ((ret = dbp->cursor(dbp, txn, &dbc, 0)) != 0)
+		return (ret);
+
+	trunc.count = 0;
+	trunc.dbc = dbc;
+	/* Walk the tree, freeing pages. */
+	ret = __bam_traverse(dbc,
+	    DB_LOCK_WRITE, dbc->internal->root, __db_truncate_callback, &trunc);
+
+	/* Discard the cursor. */
+	if ((t_ret = dbc->c_close(dbc)) != 0 && ret == 0)
+		ret = t_ret;
+
+	*countp = trunc.count;
+
+	return (ret);
+}

bdb/btree/bt_rsearch.c

 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997, 1998, 1999, 2000
+ * Copyright (c) 1996-2002
  *	Sleepycat Software.  All rights reserved.
  */
 /*
@@ -40,7 +40,7 @@
 #include "db_config.h"
 
 #ifndef lint
-static const char revid[] = "$Id: bt_rsearch.c,v 11.21 2000/03/28 21:50:04 ubell Exp $";
+static const char revid[] = "$Id: bt_rsearch.c,v 11.34 2002/07/03 19:03:50 bostic Exp $";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -48,10 +48,10 @@ static const char revid[] = "$Id: bt_rsearch.c,v 11.21 2000/03/28 21:50:04 ubell
 #endif
 
 #include "db_int.h"
-#include "db_page.h"
-#include "btree.h"
-#include "db_shash.h"
-#include "lock.h"
+#include "dbinc/db_page.h"
+#include "dbinc/btree.h"
+#include "dbinc/db_shash.h"
+#include "dbinc/lock.h"
 
 /*
  * __bam_rsearch --
@@ -70,6 +70,7 @@ __bam_rsearch(dbc, recnop, flags, stop, exactp)
 	BTREE_CURSOR *cp;
 	DB *dbp;
 	DB_LOCK lock;
+	DB_MPOOLFILE *mpf;
 	PAGE *h;
 	RINTERNAL *ri;
 	db_indx_t adjust, deloffset, indx, top;
@@ -79,6 +80,7 @@ __bam_rsearch(dbc, recnop, flags, stop, exactp)
 	int ret, stack;
 
 	dbp = dbc->dbp;
+	mpf = dbp->mpf;
 	cp = (BTREE_CURSOR *)dbc->internal;
 
 	BT_STK_CLR(cp);
@@ -99,11 +101,11 @@ __bam_rsearch(dbc, recnop, flags, stop, exactp)
 	 * Retrieve the root page.
 	 */
 	pg = cp->root;
-	stack = LF_ISSET(S_STACK);
+	stack = LF_ISSET(S_STACK) ? 1 : 0;
 	lock_mode = stack ? DB_LOCK_WRITE : DB_LOCK_READ;
 	if ((ret = __db_lget(dbc, 0, pg, lock_mode, 0, &lock)) != 0)
 		return (ret);
-	if ((ret = memp_fget(dbp->mpf, &pg, 0, &h)) != 0) {
+	if ((ret = mpf->get(mpf, &pg, 0, &h)) != 0) {
 		/* Did not read it, so we can release the lock */
 		(void)__LPUT(dbc, lock);
 		return (ret);
@@ -120,12 +122,12 @@ __bam_rsearch(dbc, recnop, flags, stop, exactp)
 	if (!stack &&
 	    ((LF_ISSET(S_PARENT) && (u_int8_t)(stop + 1) >= h->level) ||
 	    (LF_ISSET(S_WRITE) && h->level == LEAFLEVEL))) {
-		(void)memp_fput(dbp->mpf, h, 0);
+		(void)mpf->put(mpf, h, 0);
 		(void)__LPUT(dbc, lock);
 		lock_mode = DB_LOCK_WRITE;
 		if ((ret = __db_lget(dbc, 0, pg, lock_mode, 0, &lock)) != 0)
 			return (ret);
-		if ((ret = memp_fget(dbp->mpf, &pg, 0, &h)) != 0) {
+		if ((ret = mpf->get(mpf, &pg, 0, &h)) != 0) {
 			/* Did not read it, so we can release the lock */
 			(void)__LPUT(dbc, lock);
 			return (ret);
@@ -164,7 +166,7 @@ __bam_rsearch(dbc, recnop, flags, stop, exactp)
 				 * eliminate any concurrency.  A possible fix
 				 * would be to lock the last leaf page instead.
 				 */
-				(void)memp_fput(dbp->mpf, h, 0);
+				(void)mpf->put(mpf, h, 0);
 				(void)__TLPUT(dbc, lock);
 				return (DB_NOTFOUND);
 			}
@@ -202,8 +204,8 @@ __bam_rsearch(dbc, recnop, flags, stop, exactp)
 						goto err;
 					}
 				}
-				if (!B_DISSET(
-				    GET_BKEYDATA(h, indx + deloffset)->type) &&
+				if (!B_DISSET(GET_BKEYDATA(dbp, h,
+				    indx + deloffset)->type) &&
 				    ++t_recno == recno)
 					break;
 			}
@@ -216,7 +218,7 @@ __bam_rsearch(dbc, recnop, flags, stop, exactp)
 			return (0);
 		case P_IBTREE:
 			for (indx = 0, top = NUM_ENT(h);;) {
-				bi = GET_BINTERNAL(h, indx);
+				bi = GET_BINTERNAL(dbp, h, indx);
 				if (++indx == top || total + bi->nrecs >= recno)
 					break;
 				total += bi->nrecs;
@@ -235,7 +237,7 @@ __bam_rsearch(dbc, recnop, flags, stop, exactp)
 			return (0);
 		case P_IRECNO:
 			for (indx = 0, top = NUM_ENT(h);;) {
-				ri = GET_RINTERNAL(h, indx);
+				ri = GET_RINTERNAL(dbp, h, indx);
 				if (++indx == top || total + ri->nrecs >= recno)
 					break;
 				total += ri->nrecs;
@@ -243,7 +245,7 @@ __bam_rsearch(dbc, recnop, flags, stop, exactp)
 			pg = ri->pgno;
 			break;
 		default:
-			return (__db_pgfmt(dbp, h->pgno));
+			return (__db_pgfmt(dbp->dbenv, h->pgno));
 		}
 		--indx;
 
@@ -276,12 +278,12 @@ __bam_rsearch(dbc, recnop, flags, stop, exactp)
 			    (h->level - 1) == LEAFLEVEL)
 				stack = 1;
 
-			(void)memp_fput(dbp->mpf, h, 0);
+			(void)mpf->put(mpf, h, 0);
 
 			lock_mode = stack &&
 			    LF_ISSET(S_WRITE) ? DB_LOCK_WRITE : DB_LOCK_READ;
 			if ((ret = __db_lget(dbc,
-			    LCK_COUPLE, pg, lock_mode, 0, &lock)) != 0) {
+			    LCK_COUPLE_ALWAYS, pg, lock_mode, 0, &lock)) != 0) {
 				/*
 				 * If we fail, discard the lock we held.  This
 				 * is OK because this only happens when we are
@@ -292,7 +294,7 @@ __bam_rsearch(dbc, recnop, flags, stop, exactp)
 			}
 		}
 
-		if ((ret = memp_fget(dbp->mpf, &pg, 0, &h)) != 0)
+		if ((ret = mpf->get(mpf, &pg, 0, &h)) != 0)
 			goto err;
 	}
 	/* NOTREACHED */
@@ -315,12 +317,14 @@ __bam_adjust(dbc, adjust)
 {
 	BTREE_CURSOR *cp;
 	DB *dbp;
+	DB_MPOOLFILE *mpf;
 	EPG *epg;
 	PAGE *h;
 	db_pgno_t root_pgno;
 	int ret;
 
 	dbp = dbc->dbp;
+	mpf = dbp->mpf;
 	cp = (BTREE_CURSOR *)dbc->internal;
 	root_pgno = cp->root;
 
@@ -328,22 +332,27 @@ __bam_adjust(dbc, adjust)
 	for (epg = cp->sp; epg <= cp->csp; ++epg) {
 		h = epg->page;
 		if (TYPE(h) == P_IBTREE || TYPE(h) == P_IRECNO) {
-			if (DB_LOGGING(dbc) &&
-			    (ret = __bam_cadjust_log(dbp->dbenv,
-			    dbc->txn, &LSN(h), 0, dbp->log_fileid,
-			    PGNO(h), &LSN(h), (u_int32_t)epg->indx, adjust,
-			    PGNO(h) == root_pgno ? CAD_UPDATEROOT : 0)) != 0)
+			if (DBC_LOGGING(dbc)) {
+				if ((ret = __bam_cadjust_log(dbp, dbc->txn,
+				    &LSN(h), 0, PGNO(h), &LSN(h),
+				    (u_int32_t)epg->indx, adjust,
+				    PGNO(h) == root_pgno ?
+				    CAD_UPDATEROOT : 0)) != 0)
 					return (ret);
+			} else
+				LSN_NOT_LOGGED(LSN(h));
 
 			if (TYPE(h) == P_IBTREE)
-				GET_BINTERNAL(h, epg->indx)->nrecs += adjust;
+				GET_BINTERNAL(dbp, h, epg->indx)->nrecs +=
+				    adjust;
 			else
-				GET_RINTERNAL(h, epg->indx)->nrecs += adjust;
+				GET_RINTERNAL(dbp, h, epg->indx)->nrecs +=
+				    adjust;
 
 			if (PGNO(h) == root_pgno)
 				RE_NREC_ADJ(h, adjust);
 
-			if ((ret = memp_fset(dbp->mpf, h, DB_MPOOL_DIRTY)) != 0)
+			if ((ret = mpf->set(mpf, h, DB_MPOOL_DIRTY)) != 0)
 				return (ret);
 		}
 	}
@@ -363,21 +372,23 @@ __bam_nrecs(dbc, rep)
 {
 	DB *dbp;
 	DB_LOCK lock;
+	DB_MPOOLFILE *mpf;
 	PAGE *h;
 	db_pgno_t pgno;
 	int ret;
 
 	dbp = dbc->dbp;
+	mpf = dbp->mpf;
 
 	pgno = dbc->internal->root;
 	if ((ret = __db_lget(dbc, 0, pgno, DB_LOCK_READ, 0, &lock)) != 0)
 		return (ret);
-	if ((ret = memp_fget(dbp->mpf, &pgno, 0, &h)) != 0)
+	if ((ret = mpf->get(mpf, &pgno, 0, &h)) != 0)
 		return (ret);
 
 	*rep = RE_NREC(h);
 
-	(void)memp_fput(dbp->mpf, h, 0);
+	(void)mpf->put(mpf, h, 0);
 	(void)__TLPUT(dbc, lock);
 
 	return (0);
@@ -387,10 +398,11 @@ __bam_nrecs(dbc, rep)
  * __bam_total --
  *	Return the number of records below a page.
  *
- * PUBLIC: db_recno_t __bam_total __P((PAGE *));
+ * PUBLIC: db_recno_t __bam_total __P((DB *, PAGE *));
  */
 db_recno_t
-__bam_total(h)
+__bam_total(dbp, h)
+	DB *dbp;
 	PAGE *h;
 {
 	db_recno_t nrecs;
@@ -403,25 +415,26 @@ __bam_total(h)
 	case P_LBTREE:
 		/* Check for logically deleted records. */
 		for (indx = 0; indx < top; indx += P_INDX)
-			if (!B_DISSET(GET_BKEYDATA(h, indx + O_INDX)->type))
+			if (!B_DISSET(
+			    GET_BKEYDATA(dbp, h, indx + O_INDX)->type))
 				++nrecs;
 		break;
 	case P_LDUP:
 		/* Check for logically deleted records. */
 		for (indx = 0; indx < top; indx += O_INDX)
-			if (!B_DISSET(GET_BKEYDATA(h, indx)->type))
+			if (!B_DISSET(GET_BKEYDATA(dbp, h, indx)->type))
 				++nrecs;
 		break;
 	case P_IBTREE:
 		for (indx = 0; indx < top; indx += O_INDX)
-			nrecs += GET_BINTERNAL(h, indx)->nrecs;
+			nrecs += GET_BINTERNAL(dbp, h, indx)->nrecs;
 		break;
 	case P_LRECNO:
 		nrecs = NUM_ENT(h);
 		break;
 	case P_IRECNO:
 		for (indx = 0; indx < top; indx += O_INDX)
-			nrecs += GET_RINTERNAL(h, indx)->nrecs;
+			nrecs += GET_RINTERNAL(dbp, h, indx)->nrecs;
 		break;
 	}
 

bdb/btree/bt_upgrade.c

 /*-
  * 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: bt_upgrade.c,v 11.19 2000/11/30 00:58:29 ubell Exp $";
+static const char revid[] = "$Id: bt_upgrade.c,v 11.25 2002/08/06 06:11:13 bostic Exp $";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -18,11 +18,9 @@ static const char revid[] = "$Id: bt_upgrade.c,v 11.19 2000/11/30 00:58:29 ubell
 #endif
 
 #include "db_int.h"
-#include "db_page.h"
-#include "db_swap.h"
-#include "btree.h"
-#include "db_am.h"
-#include "db_upgrade.h"
+#include "dbinc/db_page.h"
+#include "dbinc/db_am.h"
+#include "dbinc/db_upgrade.h"
 
 /*
  * __bam_30_btreemeta --
@@ -147,15 +145,15 @@ __bam_31_lbtree(dbp, real_name, flags, fhp, h, dirtyp)
 
 	ret = 0;
 	for (indx = O_INDX; indx < NUM_ENT(h); indx += P_INDX) {
-		bk = GET_BKEYDATA(h, indx);
+		bk = GET_BKEYDATA(dbp, h, indx);
 		if (B_TYPE(bk->type) == B_DUPLICATE) {
-			pgno = GET_BOVERFLOW(h, indx)->pgno;
+			pgno = GET_BOVERFLOW(dbp, h, indx)->pgno;
 			if ((ret = __db_31_offdup(dbp, real_name, fhp,
 			    LF_ISSET(DB_DUPSORT) ? 1 : 0, &pgno)) != 0)
 				break;
-			if (pgno != GET_BOVERFLOW(h, indx)->pgno) {
+			if (pgno != GET_BOVERFLOW(dbp, h, indx)->pgno) {
 				*dirtyp = 1;
-				GET_BOVERFLOW(h, indx)->pgno = pgno;
+				GET_BOVERFLOW(dbp, h, indx)->pgno = pgno;
 			}
 		}
 	}

bdb/build_vxworks/BerkeleyDB.wsp

@@ -10,12 +10,17 @@ Workspace
 
 <BEGIN> projectList
 $(PRJ_DIR)/BerkeleyDB.wpj \
-	$(PRJ_DIR)/ex_access/ex_access.wpj \
-	$(PRJ_DIR)/ex_btrec/ex_btrec.wpj \
-	$(PRJ_DIR)/ex_env/ex_env.wpj \
-	$(PRJ_DIR)/ex_mpool/ex_mpool.wpj \
-	$(PRJ_DIR)/ex_tpcb/ex_tpcb.wpj \
-	$(PRJ_DIR)/ex_dbclient/ex_dbclient.wpj
+	$(PRJ_DIR)/db_archive/db_archive.wpj \
+	$(PRJ_DIR)/db_checkpoint/db_checkpoint.wpj \
+	$(PRJ_DIR)/db_deadlock/db_deadlock.wpj \
+	$(PRJ_DIR)/db_dump/db_dump.wpj \
+	$(PRJ_DIR)/db_load/db_load.wpj \
+	$(PRJ_DIR)/db_printlog/db_printlog.wpj \
+	$(PRJ_DIR)/db_recover/db_recover.wpj \
+	$(PRJ_DIR)/db_stat/db_stat.wpj \
+	$(PRJ_DIR)/db_upgrade/db_upgrade.wpj \
+	$(PRJ_DIR)/db_verify/db_verify.wpj \
+	$(PRJ_DIR)/dbdemo/dbdemo.wpj
 <END>
 
 <BEGIN> userComments

bdb/build_win32/db_java_xaj.mak

+JAVA_XADIR=../java/src/com/sleepycat/db/xa
+
+JAVA_XASRCS=\
+	$(JAVA_XADIR)/DbXAResource.java \
+	$(JAVA_XADIR)/DbXid.java
+
+Release/dbxa.jar : $(JAVA_XASRCS)
+	@echo compiling Berkeley DB XA classes 
+	@javac -g -d ./Release/classes -classpath "$(CLASSPATH);./Release/classes" $(JAVA_XASRCS)
+	@echo creating jar file 
+	@cd .\Release\classes 
+	@jar cf ../dbxa.jar com\sleepycat\db\xa\*.class 
+	@echo Java XA build finished 
+
+Debug/dbxa.jar : $(JAVA_XASRCS)
+	@echo compiling Berkeley DB XA classes 
+	@javac -g -d ./Debug/classes -classpath "$(CLASSPATH);./Debug/classes" $(JAVA_XASRCS)
+	@echo creating jar file 
+	@cd .\Debug\classes 
+	@jar cf ../dbxa.jar com\sleepycat\db\xa\*.class 
+	@echo Java XA build finished