merge 5.3.21

Author: Gregory Burd

README

@@ -1,4 +1,4 @@
-Berkeley DB 11g Release 2, library version 11.2.5.2.28: (June 10, 2011)
+Berkeley DB 11g Release 2, library version 11.2.5.3.21: (May 11, 2012)
 
 This is Berkeley DB 11g Release 2 from Oracle.  To view release and
 installation documentation, load the distribution file docs/index.html

dist/ChangeLog

@@ -223,8 +223,8 @@ HASH_OBJS=\
 HASH_VRFY_OBJS=\
 	hash_verify@o@
 HEAP_OBJS=\
-	heap@o@ heap_auto@o@ heap_conv@o@ heap_method@o@ heap_open@o@ \
-	heap_rec@o@ heap_reclaim@o@ heap_stat@o@
+	heap@o@ heap_auto@o@ heap_backup@o@ heap_conv@o@ heap_method@o@ \
+	heap_open@o@ heap_rec@o@ heap_reclaim@o@ heap_stat@o@
 HEAP_VRFY_OBJS=\
 	heap_verify@o@
 QUEUE_OBJS=\
@@ -263,39 +263,41 @@ XA_OBJS=\
 # object files in order to generate the additional objects in @FINAL_OBJS@.
 
 DTRACE_OBJS= @ADDITIONAL_OBJS@ @REPLACEMENT_OBJS@ @CRYPTO_OBJS@ \
-	clock@o@ crdel_auto@o@ crdel_rec@o@ db@o@ db_am@o@ \
-	db_auto@o@ db_byteorder@o@ db_cam@o@ db_cds@o@ db_compact@o@ \
-	db_compint@o@ db_conv@o@ db_copy@o@ db_dispatch@o@ db_dup@o@ db_err@o@ \
-	db_getlong@o@ db_idspace@o@ db_iface@o@ db_join@o@ db_log2@o@ \
-	db_meta@o@ db_method@o@ db_open@o@ db_overflow@o@ db_pr@o@ db_rec@o@ \
-	db_reclaim@o@ db_remove@o@ db_rename@o@ db_ret@o@ db_setid@o@ \
-	db_setlsn@o@ db_shash@o@ db_sort_multiple@o@ db_stati@o@ \
-	db_truncate@o@ db_upg@o@ db_upg_opd@o@ dbreg@o@ dbreg_stat@o@ \
-	dbreg_auto@o@ dbreg_rec@o@ dbreg_util@o@ dbt@o@ env_alloc@o@ \
-	env_config@o@ env_failchk@o@ env_file@o@ env_globals@o@ env_open@o@ \
-	env_method@o@ env_name@o@ env_recover@o@ env_region@o@ env_register@o@ \
-	env_sig@o@ env_stat@o@ fileops_auto@o@ fop_basic@o@ fop_rec@o@ \
-	fop_util@o@ hash_func@o@ hmac@o@ log@o@ log_archive@o@ \
-	log_compare@o@ log_debug@o@ log_get@o@ log_method@o@ log_print@o@ \
-	log_put@o@ log_stat@o@ mkpath@o@ mp_alloc@o@ mp_bh@o@ mp_fget@o@ \
+	clock@o@ crdel_auto@o@ crdel_rec@o@ db@o@ db_am@o@ db_auto@o@ \
+	db_backup@o@ db_byteorder@o@ db_cam@o@ db_cds@o@ db_compact@o@ \
+	db_compint@o@ db_conv@o@ db_copy@o@ db_dispatch@o@ db_dup@o@ \
+	db_err@o@ db_getlong@o@ db_idspace@o@ db_iface@o@ db_join@o@ \
+	db_log2@o@ db_meta@o@ db_method@o@ db_open@o@ db_overflow@o@ \
+	db_pr@o@ db_rec@o@ db_reclaim@o@ db_remove@o@ db_rename@o@ \
+	db_ret@o@ db_setid@o@ db_setlsn@o@ db_shash@o@ db_sort_multiple@o@ \
+	db_stati@o@ db_truncate@o@ db_upg@o@ db_upg_opd@o@ dbreg@o@ \
+	dbreg_stat@o@ dbreg_auto@o@ dbreg_rec@o@ dbreg_util@o@ \
+	dbt@o@ env_alloc@o@ env_config@o@ env_backup@o@ env_failchk@o@ \
+	env_file@o@ env_globals@o@ env_open@o@ env_method@o@ env_name@o@ \
+	env_recover@o@ env_region@o@ env_register@o@ env_sig@o@ \
+	env_stat@o@ fileops_auto@o@ fop_basic@o@ fop_rec@o@ fop_util@o@ \
+	hash_func@o@ hmac@o@ log@o@ log_archive@o@ log_compare@o@ \
+	log_debug@o@ log_get@o@ log_method@o@ log_print@o@ log_put@o@ \
+	log_stat@o@ mkpath@o@ mp_alloc@o@ mp_backup@o@ mp_bh@o@ mp_fget@o@ \
 	mp_fmethod@o@ mp_fopen@o@ mp_fput@o@ mp_fset@o@ mp_method@o@ \
 	mp_mvcc@o@ mp_region@o@ mp_register@o@ mp_resize@o@ mp_stat@o@ \
 	mp_sync@o@ mp_trickle@o@ openflags@o@ os_abort@o@ os_abs@o@ \
 	os_alloc@o@ os_clock@o@ os_cpu@o@ os_ctime@o@ os_config@o@ \
 	os_dir@o@ os_errno@o@ os_fid@o@ os_flock@o@ os_fsync@o@ \
 	os_getenv@o@ os_handle@o@ os_map@o@ os_method@o@ os_mkdir@o@ \
-	os_open@o@ os_pid@o@ os_rename@o@ os_root@o@ os_rpath@o@ \
-	os_rw@o@ os_seek@o@ os_stack@o@ os_stat@o@ os_tmpdir@o@ \
-	os_truncate@o@ os_uid@o@ os_unlink@o@ os_yield@o@ partition@o@ \
-	seq_stat@o@ sequence@o@ sha1@o@ snprintf@o@ txn@o@ txn_auto@o@ \
-	txn_chkpt@o@ txn_failchk@o@ txn_method@o@ txn_rec@o@ txn_recover@o@ \
-	txn_region@o@ txn_stat@o@ txn_util@o@ xa@o@ xa_map@o@ zerofill@o@
+	os_open@o@ os_path@o@ os_pid@o@ os_rename@o@ os_root@o@ \
+	os_rpath@o@ os_rw@o@ os_seek@o@ os_stack@o@ os_stat@o@ \
+	os_tmpdir@o@ os_truncate@o@ os_uid@o@ os_unlink@o@ os_yield@o@ \
+	partition@o@ seq_stat@o@ sequence@o@ sha1@o@ snprintf@o@ txn@o@ \
+	txn_auto@o@ txn_chkpt@o@ txn_failchk@o@ txn_method@o@ txn_rec@o@ \
+	txn_recover@o@ txn_region@o@ txn_stat@o@ txn_util@o@ xa@o@ \
+	xa_map@o@ zerofill@o@ \
 
 C_OBJS=	$(DTRACE_OBJS) @FINAL_OBJS@
 
 CUTEST_OBJS=\
-	CuTest@o@ CuTests@o@ Runner@o@ TestChannel@o@ TestDbTuner@o@ \
-	TestEncryption@o@ TestEnvConfig@o@ TestEnvMethod@o@ \
+	CuTest@o@ CuTests@o@ Runner@o@ TestChannel@o@ TestDbHotBackup@o@ \
+	TestDbTuner@o@ TestEncryption@o@ TestEnvConfig@o@ TestEnvMethod@o@ \
 	TestKeyExistErrorReturn@o@ TestPartial@o@ TestQueue@o@ \
 
 CXX_OBJS=\
@@ -315,13 +317,14 @@ JAVA_DBSRCS=\
 	$(JAVA_SLEEPYCAT)/asm/AnnotationWriter.java \
 	$(JAVA_SLEEPYCAT)/asm/Attribute.java \
 	$(JAVA_SLEEPYCAT)/asm/ByteVector.java \
-	$(JAVA_SLEEPYCAT)/asm/ClassAdapter.java \
 	$(JAVA_SLEEPYCAT)/asm/ClassReader.java \
 	$(JAVA_SLEEPYCAT)/asm/ClassVisitor.java \
 	$(JAVA_SLEEPYCAT)/asm/ClassWriter.java \
 	$(JAVA_SLEEPYCAT)/asm/Edge.java \
 	$(JAVA_SLEEPYCAT)/asm/FieldVisitor.java \
 	$(JAVA_SLEEPYCAT)/asm/FieldWriter.java \
+	$(JAVA_SLEEPYCAT)/asm/Frame.java \
+	$(JAVA_SLEEPYCAT)/asm/Handle.java \
 	$(JAVA_SLEEPYCAT)/asm/Handler.java \
 	$(JAVA_SLEEPYCAT)/asm/Item.java \
 	$(JAVA_SLEEPYCAT)/asm/Label.java \
@@ -401,6 +404,8 @@ JAVA_DBSRCS=\
 	$(JAVA_SLEEPYCAT)/collections/TransactionWorker.java \
 	$(JAVA_SLEEPYCAT)/collections/TupleSerialFactory.java \
 	$(JAVA_SLEEPYCAT)/compat/DbCompat.java \
+	$(JAVA_SLEEPYCAT)/db/BackupHandler.java \
+	$(JAVA_SLEEPYCAT)/db/BackupOptions.java \
 	$(JAVA_SLEEPYCAT)/db/BtreeCompressor.java \
 	$(JAVA_SLEEPYCAT)/db/BtreePrefixCalculator.java \
 	$(JAVA_SLEEPYCAT)/db/BtreeStats.java \
@@ -478,6 +483,7 @@ JAVA_DBSRCS=\
 	$(JAVA_SLEEPYCAT)/db/ReplicationLeaseExpiredException.java \
 	$(JAVA_SLEEPYCAT)/db/ReplicationLockoutException.java \
 	$(JAVA_SLEEPYCAT)/db/ReplicationManagerAckPolicy.java \
+	$(JAVA_SLEEPYCAT)/db/ReplicationManagerConnectionStatus.java \
 	$(JAVA_SLEEPYCAT)/db/ReplicationManagerMessageDispatch.java \
 	$(JAVA_SLEEPYCAT)/db/ReplicationManagerSite.java \
 	$(JAVA_SLEEPYCAT)/db/ReplicationManagerSiteConfig.java \
@@ -539,6 +545,7 @@ JAVA_DBSRCS=\
 	$(JAVA_SLEEPYCAT)/persist/PrimaryKeyValueAdapter.java \
 	$(JAVA_SLEEPYCAT)/persist/SecondaryIndex.java \
 	$(JAVA_SLEEPYCAT)/persist/StoreConfig.java \
+	$(JAVA_SLEEPYCAT)/persist/StoreConfigBeanInfo.java \
 	$(JAVA_SLEEPYCAT)/persist/StoreExistsException.java \
 	$(JAVA_SLEEPYCAT)/persist/StoreNotFoundException.java \
 	$(JAVA_SLEEPYCAT)/persist/SubIndex.java \
@@ -550,6 +557,7 @@ JAVA_DBSRCS=\
 	$(JAVA_SLEEPYCAT)/persist/evolve/Deleter.java \
 	$(JAVA_SLEEPYCAT)/persist/evolve/EntityConverter.java \
 	$(JAVA_SLEEPYCAT)/persist/evolve/EvolveConfig.java \
+	$(JAVA_SLEEPYCAT)/persist/evolve/EvolveConfigBeanInfo.java \
 	$(JAVA_SLEEPYCAT)/persist/evolve/EvolveEvent.java \
 	$(JAVA_SLEEPYCAT)/persist/evolve/EvolveInternal.java \
 	$(JAVA_SLEEPYCAT)/persist/evolve/EvolveListener.java \
@@ -627,6 +635,8 @@ JAVA_DBSRCS=\
 	$(JAVA_SLEEPYCAT)/persist/raw/RawObject.java \
 	$(JAVA_SLEEPYCAT)/persist/raw/RawStore.java \
 	$(JAVA_SLEEPYCAT)/persist/raw/RawType.java \
+	$(JAVA_SLEEPYCAT)/util/ClassResolver.java \
+	$(JAVA_SLEEPYCAT)/util/ConfigBeanInfoBase.java \
 	$(JAVA_SLEEPYCAT)/util/ErrorBuffer.java \
 	$(JAVA_SLEEPYCAT)/util/ExceptionUnwrapper.java \
 	$(JAVA_SLEEPYCAT)/util/ExceptionWrapper.java \
@@ -1306,10 +1316,12 @@ CuTests@o@: $(testdir)/c/cutest/CuTests.c
 	$(CC) $(CUTEST_FLAGS) $?
 Runner@o@: $(testdir)/c/cutest/Runner.c
 	$(CC) $(CUTEST_FLAGS) $?
-TestDbTuner@o@: $(testdir)/c/suites/TestDbTuner.c
-	$(CC) $(CUTEST_FLAGS) $?
 TestChannel@o@: $(testdir)/c/suites/TestChannel.c
 	$(CC) $(CUTEST_FLAGS) $?
+TestDbHotBackup@o@: $(testdir)/c/suites/TestDbHotBackup.c
+	$(CC) $(CUTEST_FLAGS) $?
+TestDbTuner@o@: $(testdir)/c/suites/TestDbTuner.c
+	$(CC) $(CUTEST_FLAGS) $?
 TestEncryption@o@: $(testdir)/c/suites/TestEncryption.c
 	$(CC) $(CUTEST_FLAGS) $?
 TestEnvConfig@o@: $(testdir)/c/suites/TestEnvConfig.c
@@ -1899,6 +1911,8 @@ db_autop@o@: $(srcdir)/db/db_autop.c
 	 $(CC) $(CFLAGS) $?
 db_byteorder@o@: $(srcdir)/common/db_byteorder.c
 	 $(CC) $(CFLAGS) $?
+db_backup@o@: $(srcdir)/db/db_backup.c
+	 $(CC) $(CFLAGS) $?
 db_cam@o@: $(srcdir)/db/db_cam.c
 	 $(CC) $(CFLAGS) $?
 db_cds@o@: $(srcdir)/db/db_cds.c
@@ -1991,6 +2005,8 @@ env_alloc@o@: $(srcdir)/env/env_alloc.c
 	 $(CC) $(CFLAGS) $?
 env_config@o@: $(srcdir)/env/env_config.c
 	 $(CC) $(CFLAGS) $?
+env_backup@o@: $(srcdir)/env/env_backup.c
+	 $(CC) $(CFLAGS) $?
 env_failchk@o@: $(srcdir)/env/env_failchk.c
 	 $(CC) $(CFLAGS) $?
 env_file@o@: $(srcdir)/env/env_file.c
@@ -2063,6 +2079,8 @@ heap_auto@o@: $(srcdir)/heap/heap_auto.c
 	 $(CC) $(CFLAGS) $?
 heap_autop@o@: $(srcdir)/heap/heap_autop.c
 	 $(CC) $(CFLAGS) $?
+heap_backup@o@: $(srcdir)/heap/heap_backup.c
+	 $(CC) $(CFLAGS) $?
 heap_conv@o@: $(srcdir)/heap/heap_conv.c
 	 $(CC) $(CFLAGS) $?
 heap_method@o@: $(srcdir)/heap/heap_method.c
@@ -2141,6 +2159,8 @@ mp_alloc@o@: $(srcdir)/mp/mp_alloc.c
 	 $(CC) $(CFLAGS) $?
 mp_bh@o@: $(srcdir)/mp/mp_bh.c
 	 $(CC) $(CFLAGS) $?
+mp_backup@o@: $(srcdir)/mp/mp_backup.c
+	 $(CC) $(CFLAGS) $?
 mp_fget@o@: $(srcdir)/mp/mp_fget.c
 	 $(CC) $(CFLAGS) $?
 mp_fmethod@o@: $(srcdir)/mp/mp_fmethod.c
@@ -2229,6 +2249,8 @@ os_mkdir@o@: $(srcdir)/@OSDIR@/os_mkdir.c
 	 $(CC) $(CFLAGS) $?
 os_open@o@: $(srcdir)/@OSDIR@/os_open.c
 	 $(CC) $(CFLAGS) $?
+os_path@o@: $(srcdir)/os/os_path.c
+	 $(CC) $(CFLAGS) $?
 os_pid@o@: $(srcdir)/os/os_pid.c
 	 $(CC) $(CFLAGS) $?
 os_qnx_fsync@o@: $(srcdir)/os_qnx/os_qnx_fsync.c

dist/Makefile.in

@@ -4,13 +4,13 @@ DB_VERSION_FAMILY=11
 DB_VERSION_LETTER="g"
 DB_VERSION_RELEASE=2
 DB_VERSION_MAJOR=5
-DB_VERSION_MINOR=2
-DB_VERSION_PATCH=28
+DB_VERSION_MINOR=3
+DB_VERSION_PATCH=21
 DB_VERSION="$DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH"
 DB_VERSION_FULL="$DB_VERSION_FAMILY.$DB_VERSION_RELEASE.$DB_VERSION_MAJOR.$DB_VERSION_MINOR.$DB_VERSION_PATCH"
 
 DB_VERSION_UNIQUE_NAME=`printf "_%d%03d" $DB_VERSION_MAJOR $DB_VERSION_MINOR`
 
-DB_RELEASE_DATE="June 10, 2011"
+DB_RELEASE_DATE="May 11, 2012"
 DB_VERSION_STRING="Berkeley DB $DB_VERSION: ($DB_RELEASE_DATE)"
 DB_VERSION_FULL_STRING="Berkeley DB $DB_VERSION_FAMILY$DB_VERSION_LETTER Release $DB_VERSION_RELEASE, library version $DB_VERSION_FULL: ($DB_RELEASE_DATE)"

dist/RELEASE

@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Oracle and/or its affiliates.  All rights reserved.
+# Copyright (c) 2011, 2012 Oracle and/or its affiliates.  All rights reserved.
 
 # Detect mmap capability: If the file underlying an mmap is extended,
 # does the addressable memory grow too?

dist/aclocal/mmap.m4

@@ -156,7 +156,8 @@ if test "$db_cv_mingw" = yes; then
 fi
 
 if test "$db_cv_mutex" = no; then
-	# User-specified POSIX or UI mutexes.
+	# Check for the availability of POSIX or UI mutexes; also check
+	# whether the user has specified POSIX with --enable-posixmutexes.
 	#
 	# There are two different reasons to specify mutexes: First, the
 	# application is already using one type of mutex and doesn't want
@@ -178,21 +179,35 @@ if test "$db_cv_mutex" = no; then
 
 	# POSIX.1 pthreads: pthread_XXX
 	#
-	# If the user specified we use POSIX pthreads mutexes, and we fail to
-	# find the full interface, try and configure for just intra-process
-	# support.
-	if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
-		LIBS="$LIBS -lpthread"
-		AM_PTHREADS_SHARED(POSIX/pthreads/library)
-		AM_PTHREADS_CONDVAR_DUPINITCHK
-		AM_PTHREADS_RWLOCKVAR_DUPINITCHK
-		LIBS="$orig_libs"
-	fi
-	if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
-		AM_PTHREADS_SHARED(POSIX/pthreads)
-		AM_PTHREADS_CONDVAR_DUPINITCHK
-		AM_PTHREADS_RWLOCKVAR_DUPINITCHK
-	fi
+	# If we find POSIX pthreads mutexes but not the full interface,
+	# try to configure for just intra-process support.
+	case "$host_os" in
+	    darwin*)
+		# Mac OS 10.7 Lion has broken pthread_*_setpshared() calls.
+		# Most BSD-like operating systems have pointers in their mutex
+		# and condition variables, and cannot be shared between
+		# proceses.  Earlier Mac OS releases correctly returned EINVAL
+		# from *_setpshared(PTHREAD_PROCESS_SHARED), but 10.7 returns
+		# success. Since we can't trust those calls anymore we now
+		# avoid these probes for multiprocess pthreads.
+		;;
+	    *)
+		if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
+			LIBS="$LIBS -lpthread"
+			AM_PTHREADS_SHARED(POSIX/pthreads/library)
+			AM_PTHREADS_CONDVAR_DUPINITCHK
+			AM_PTHREADS_RWLOCKVAR_DUPINITCHK
+			LIBS="$orig_libs"
+		fi
+		if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
+			AM_PTHREADS_SHARED(POSIX/pthreads)
+			AM_PTHREADS_CONDVAR_DUPINITCHK
+			AM_PTHREADS_RWLOCKVAR_DUPINITCHK
+		fi
+		;;
+	esac
+	# We probe for private pthreads only when the user has asked for posix
+	# mutexes and we don't have a multiprocess pthreads library available. 
 	if test "$db_cv_mutex" = posix_only; then
 		AM_PTHREADS_PRIVATE(POSIX/pthreads/private)
 		AM_PTHREADS_CONDVAR_DUPINITCHK

dist/aclocal/mutex.m4

@@ -368,6 +368,26 @@ AC_ARG_ENABLE(umrw,
 	[db_cv_umrw="$enable_umrw"], [db_cv_umrw="no"])
 AC_MSG_RESULT($db_cv_umrw)
 
+# Solaris, AI/X, OS/X and other BSD-derived systems default to POSIX-conforming
+# disk i/o: A single read or write call is atomic. Other systems do not
+# guarantee atomicity; in particular Linux and Microsoft Windows.
+atomicfileread="no"
+case "$host_os" in
+solaris* | aix* | bsdi3* | freebsd* | darwin*)
+	atomicfileread="yes";;
+esac
+AC_MSG_CHECKING(if --enable-atomicfileread option specified)
+AC_ARG_ENABLE(atomicfileread,
+	[AC_HELP_STRING([--enable-atomicfileread],
+			[Indicate that the platform reads and writes files atomically.])],
+	[db_cv_atomicfileread="$enable_atomicfileread"], [db_cv_atomicfileread=$atomicfileread])
+AC_MSG_RESULT($db_cv_atomicfileread)
+if test "$db_cv_atomicfileread" = "yes"; then
+	AC_DEFINE(HAVE_ATOMICFILEREAD)
+	AH_TEMPLATE(HAVE_ATOMICFILEREAD,
+    [Define to 1 if platform reads and writes files atomically.])
+fi
+
 # Cryptography support.
 # Until Berkeley DB 5.0, this was a simple yes/no decision.
 # With the addition of support for Intel Integrated Performance Primitives (ipp)

dist/aclocal/options.m4

@@ -87,10 +87,10 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [
 		AC_MSG_RESULT([file not found])
 	fi
 
-	# DB requires at least version 8.4.
+	# DB requires at least version 8.5.
 	if test ${TCL_MAJOR_VERSION} -lt 8 \
-	    -o ${TCL_MAJOR_VERSION} -eq 8 -a ${TCL_MINOR_VERSION} -lt 4; then
-		AC_MSG_ERROR([Berkeley DB requires Tcl version 8.4 or better.])
+	    -o ${TCL_MAJOR_VERSION} -eq 8 -a ${TCL_MINOR_VERSION} -lt 5; then
+		AC_MSG_ERROR([Berkeley DB requires Tcl version 8.5 or better.])
 	fi
 
 	# The eval is required to do substitution (for example, the TCL_DBGX

dist/aclocal/tcl.m4

@@ -1,6 +1,16 @@
 db_env_create
 	DB_CXX_NO_EXCEPTIONS		# C++: return error values
 
+DbEnv.backup
+	# Remove all files from the target directory tree first.
+	DB_BACKUP_CLEAN
+	DB_BACKUP_FILES			# Copy plain files too.
+	DB_BACKUP_NO_LOGS		# Don't backup log files.
+	DB_BACKUP_SINGLE_DIR		# All files go to a single directory.
+	DB_BACKUP_UPDATE		# Incremental backup.
+	DB_CREATE			# Create the target directories.
+	DB_EXCL				# Error if a target file exists.
+	
 DbEnv.close
 	# Sync database when automatically closing its db handles.
 	DB_FORCESYNC			
@@ -68,6 +78,7 @@ DbEnv.lock_stat_print
 
 DbEnv.lock_vec
 	DB_LOCK_CHECK			# UNDOC: check for a lock
+	DB_LOCK_IGNORE_REC		# UNDOC: get lock during recovery
 	DB_LOCK_NOWAIT			# Don't wait for an unavailable lock
 	DB_LOCK_RECORD			# UNDOC: record lock
 	DB_LOCK_SET_TIMEOUT		# UNDOC: set lock timeout
@@ -231,6 +242,7 @@ DbEnv.set_timeout
 	DB_SET_REG_TIMEOUT		# Set dbregister timeout
 
 DbEnv.set_verbose
+	DB_VERB_BACKUP			# Backup information
 	DB_VERB_DEADLOCK		# Deadlock detection information
 	DB_VERB_FILEOPS			# Major file operations
 	DB_VERB_FILEOPS_ALL		# All file operations
@@ -289,6 +301,7 @@ DbLogc.get
 
 DbMpoolFile.close
 	DB_MPOOL_DISCARD		# UNDOC: Discard file
+	DB_FLUSH			# UNDOC: opened to flush a page
 	DB_MPOOL_NOLOCK			# UNDOC: Already have mpf locked
 
 DbMpoolFile.get
@@ -305,6 +318,7 @@ DbMpoolFile.open
 	DB_DIRECT			# Don't buffer the file in the OS
 	DB_DURABLE_UNKNOWN		# UNDOC: Durability on open
 	DB_EXTENT			# UNDOC: dealing with an extent
+	DB_FLUSH			# UNDOC: opened to flush a page
 	DB_MULTIVERSION			# Multiversion concurrency control
 	DB_NOMMAP			# Don't mmap underlying file
 	DB_ODDFILESIZE			# Truncate file to N * pgsize
@@ -435,7 +449,8 @@ Db.open
 	# The following flags aren't actually part of the Db.open method
 	# API, but they are accepted by the underlying __db_open function.
 	DB_DURABLE_UNKNOWN		# UNDOC: Durability on open
-	DB_INTERNAL_DB			# UNDOC: Open db in env dir
+	DB_INTERNAL_PERSISTENT_DB	# UNDOC: Open db in metadata dir
+	DB_INTERNAL_TEMPORARY_DB	# UNDOC: Open db in env home dir
 	DB_NOERROR			# UNDOC: Don't raise errors.
 	DB_ODDFILESIZE			# UNDOC: Truncate file to N * pgsize
 	DB_WRITEOPEN			# UNDOC: open with write lock

dist/api_flags

@@ -1,7 +1,7 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 2011 Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 1996, 2012 Oracle and/or its affiliates.  All rights reserved.
  */
 
 #include <sys/types.h>