Update internal BDB to version 4.6.18.

24 files changed, 600 insertions, 293 deletions

diff --git a/db/dbinc_auto/btree_ext.h b/db/dbinc_auto/btree_ext.h
index 82916e84b..2cf47bff5 100644
--- a/db/dbinc_auto/btree_ext.h
+++ b/db/dbinc_auto/btree_ext.h
@@ -21,13 +21,13 @@ int __bam_ca_undodup __P((DB *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t));
 int __bam_ca_rsplit __P((DBC *, db_pgno_t, db_pgno_t));
 int __bam_ca_split __P((DBC *, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t, int));
 int __bam_ca_undosplit __P((DB *, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t));
-int __bam_c_init __P((DBC *, DBTYPE));
-int __bam_c_refresh __P((DBC *));
-int __bam_c_count __P((DBC *, db_recno_t *));
-int __bam_c_dup __P((DBC *, DBC *));
+int __bamc_init __P((DBC *, DBTYPE));
+int __bamc_refresh __P((DBC *));
+int __bamc_count __P((DBC *, db_recno_t *));
+int __bamc_dup __P((DBC *, DBC *));
 int __bam_bulk_overflow __P((DBC *, u_int32_t, db_pgno_t, u_int8_t *));
 int __bam_bulk_duplicates __P((DBC *, db_pgno_t, u_int8_t *, int32_t *, int32_t **, u_int8_t **, u_int32_t *, int));
-int __bam_c_rget __P((DBC *, DBT *));
+int __bamc_rget __P((DBC *, DBT *));
 int  __bam_opd_exists __P((DBC *, db_pgno_t));
 int __bam_ditem __P((DBC *, PAGE *, u_int32_t));
 int __bam_adjindx __P((DBC *, PAGE *, u_int32_t, u_int32_t, int));
@@ -68,9 +68,9 @@ int __bam_reclaim __P((DB *, DB_TXN *));
 int __bam_truncate __P((DBC *, u_int32_t *));
 int __ram_open __P((DB *, DB_TXN *, const char *, db_pgno_t, u_int32_t));
 int __ram_append __P((DBC *, DBT *, DBT *));
-int __ram_c_del __P((DBC *));
-int __ram_c_get __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-int __ram_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+int __ramc_del __P((DBC *));
+int __ramc_get __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
+int __ramc_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
 int __ram_ca __P((DBC *, ca_recno_arg, int *));
 int __ram_getno __P((DBC *, const DBT *, db_recno_t *, int));
 int __ram_writeback __P((DB *));
@@ -83,7 +83,7 @@ int __bam_search __P((DBC *, db_pgno_t, const DBT *, u_int32_t, int, db_recno_t
 int __bam_stkrel __P((DBC *, u_int32_t));
 int __bam_stkgrow __P((DB_ENV *, BTREE_CURSOR *));
 int __bam_split __P((DBC *, void *, db_pgno_t *));
-int __bam_pinsert __P((DBC *, EPG *, PAGE *, PAGE *, int));
+int __bam_pinsert __P((DBC *, EPG *, u_int32_t, PAGE *, PAGE *, int));
 int __bam_copy __P((DB *, PAGE *, PAGE *, u_int32_t, u_int32_t));
 int __bam_stat __P((DBC *, void *, u_int32_t));
 int __bam_stat_print __P((DBC *, u_int32_t));
diff --git a/db/dbinc_auto/clib_ext.h b/db/dbinc_auto/clib_ext.h
index 941152326..d841c5cfb 100644
--- a/db/dbinc_auto/clib_ext.h
+++ b/db/dbinc_auto/clib_ext.h
@@ -6,9 +6,6 @@
 extern "C" {
 #endif
 
-#ifndef HAVE_ABORT
-void abort __P((void));
-#endif
 #ifndef HAVE_ATOI
 int atoi __P((const char *));
 #endif
@@ -58,6 +55,9 @@ int fprintf __P((FILE *, const char *, ...));
 #ifndef HAVE_PRINTF
 int vfprintf __P((FILE *, const char *, va_list));
 #endif
+#ifndef HAVE_QSORT
+void qsort __P((void *, size_t, size_t, int(*)(const void *, const void *)));
+#endif
 #ifndef HAVE_RAISE
 int raise __P((int));
 #endif
diff --git a/db/dbinc_auto/common_ext.h b/db/dbinc_auto/common_ext.h
index 8d90d72fe..5525caa11 100644
--- a/db/dbinc_auto/common_ext.h
+++ b/db/dbinc_auto/common_ext.h
@@ -9,7 +9,6 @@ extern "C" {
 int __crypto_region_init __P((DB_ENV *));
 int __db_isbigendian __P((void));
 int __db_byteorder __P((DB_ENV *, int));
-void __db_difftime __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t *, u_int32_t *));
 int __db_fchk __P((DB_ENV *, const char *, u_int32_t, u_int32_t));
 int __db_fcchk __P((DB_ENV *, const char *, u_int32_t, u_int32_t, u_int32_t));
 int __db_ferr __P((const DB_ENV *, const char *, int));
@@ -21,7 +20,6 @@ void __db_assert __P((DB_ENV *, const char *, const char *, int));
 #endif
 int __db_panic_msg __P((DB_ENV *));
 int __db_panic __P((DB_ENV *, int));
-void __db_panic_set __P((DB_ENV *, int));
 char *__db_unknown_error __P((int));
 void __db_syserr __P((const DB_ENV *, int, const char *, ...)) __attribute__ ((__format__ (__printf__, 3, 4)));
 void __db_err __P((const DB_ENV *, int, const char *, ...)) __attribute__ ((__format__ (__printf__, 3, 4)));
@@ -29,12 +27,13 @@ void __db_errx __P((const DB_ENV *, const char *, ...)) __attribute__ ((__format
 void __db_errcall __P((const DB_ENV *, int, db_error_set_t, const char *, va_list));
 void __db_errfile __P((const DB_ENV *, int, db_error_set_t, const char *, va_list));
 void __db_msgadd __P((DB_ENV *, DB_MSGBUF *, const char *, ...)) __attribute__ ((__format__ (__printf__, 3, 4)));
+void __db_msgadd_ap __P((DB_ENV *, DB_MSGBUF *, const char *, va_list));
 void __db_msg __P((const DB_ENV *, const char *, ...)) __attribute__ ((__format__ (__printf__, 2, 3)));
 int __db_unknown_flag __P((DB_ENV *, char *, u_int32_t));
 int __db_unknown_type __P((DB_ENV *, char *, DBTYPE));
 int __db_unknown_path __P((DB_ENV *, char *));
-int __db_check_txn __P((DB *, DB_TXN *, u_int32_t, int));
-int __db_txn_deadlock_err __P((DB_ENV *));
+int __db_check_txn __P((DB *, DB_TXN *, DB_LOCKER *, int));
+int __db_txn_deadlock_err __P((DB_ENV *, DB_TXN *));
 int __db_not_txn_env __P((DB_ENV *));
 int __db_rec_toobig __P((DB_ENV *, u_int32_t, u_int32_t));
 int __db_rec_repl __P((DB_ENV *, u_int32_t, u_int32_t));
@@ -47,6 +46,8 @@ int __db_getlong __P((DB_ENV *, const char *, char *, long, long, long *));
 int __db_getulong __P((DB_ENV *, const char *, char *, u_long, u_long, u_long *));
 void __db_idspace __P((u_int32_t *, int, u_int32_t *, u_int32_t *));
 u_int32_t __db_log2 __P((u_int32_t));
+u_int32_t __db_tablesize __P((u_int32_t));
+void __db_hashinit __P((void *, u_int32_t));
 int __db_mkpath __P((DB_ENV *, const char *));
 int __db_util_arg __P((char *, char *, int *, char ***));
 int __db_util_cache __P((DB *, u_int32_t *, int *));
diff --git a/db/dbinc_auto/crypto_ext.h b/db/dbinc_auto/crypto_ext.h
index b305ec5a7..92bc8244a 100644
--- a/db/dbinc_auto/crypto_ext.h
+++ b/db/dbinc_auto/crypto_ext.h
@@ -12,8 +12,8 @@ int __aes_close __P((DB_ENV *, void *));
 int __aes_decrypt __P((DB_ENV *, void *, void *, u_int8_t *, size_t));
 int __aes_encrypt __P((DB_ENV *, void *, void *, u_int8_t *, size_t));
 int __aes_init __P((DB_ENV *, DB_CIPHER *));
-int __crypto_dbenv_close __P((DB_ENV *));
-int __crypto_region_destroy __P((DB_ENV *));
+int __crypto_env_close __P((DB_ENV *));
+int __crypto_env_refresh __P((DB_ENV *));
 int __crypto_algsetup __P((DB_ENV *, DB_CIPHER *, u_int32_t, int));
 int __crypto_decrypt_meta __P((DB_ENV *, DB *, u_int8_t *, int));
 int __crypto_set_passwd __P((DB_ENV *, DB_ENV *));
diff --git a/db/dbinc_auto/db_ext.h b/db/dbinc_auto/db_ext.h
index 141bd5149..f29513678 100644
--- a/db/dbinc_auto/db_ext.h
+++ b/db/dbinc_auto/db_ext.h
@@ -26,8 +26,8 @@ int __crdel_inmem_rename_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void
 int __crdel_inmem_remove_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
 int __db_master_open __P((DB *, DB_TXN *, const char *, u_int32_t, int, DB **));
 int __db_master_update __P((DB *, DB *, DB_TXN *, const char *, DBTYPE, mu_action, const char *, u_int32_t));
-int __db_dbenv_setup __P((DB *, DB_TXN *, const char *, const char *, u_int32_t, u_int32_t));
-int __db_dbenv_mpool __P((DB *, const char *, u_int32_t));
+int __db_env_setup __P((DB *, DB_TXN *, const char *, const char *, u_int32_t, u_int32_t));
+int __db_env_mpool __P((DB *, const char *, u_int32_t));
 int __db_close __P((DB *, DB_TXN *, u_int32_t));
 int __db_refresh __P((DB *, DB_TXN *, u_int32_t, int *, int));
 int __db_log_page __P((DB *, DB_TXN *, DB_LSN *, db_pgno_t, PAGE *));
@@ -35,7 +35,7 @@ int __db_backup_name __P((DB_ENV *, const char *, DB_TXN *, char **));
 #ifdef CONFIG_TEST
 int __db_testcopy __P((DB_ENV *, DB *, const char *));
 #endif
-int __db_cursor_int __P((DB *, DB_TXN *, DBTYPE, db_pgno_t, int, u_int32_t, DBC **));
+int __db_cursor_int __P((DB *, DB_TXN *, DBTYPE, db_pgno_t, int, DB_LOCKER *, DBC **));
 int __db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
 int __db_del __P((DB *, DB_TXN *, DBT *, u_int32_t));
 int __db_sync __P((DB *));
@@ -90,26 +90,31 @@ int __db_pg_new_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
 int __db_pg_init_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
 int __db_pg_sort_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
 int __db_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __db_c_close __P((DBC *));
-int __db_c_destroy __P((DBC *));
-int __db_c_count __P((DBC *, db_recno_t *));
-int __db_c_del __P((DBC *, u_int32_t));
-int __db_c_dup __P((DBC *, DBC **, u_int32_t));
-int __db_c_idup __P((DBC *, DBC **, u_int32_t));
-int __db_c_newopd __P((DBC *, db_pgno_t, DBC *, DBC **));
-int __db_c_get __P((DBC *, DBT *, DBT *, u_int32_t));
-int __db_c_put __P((DBC *, DBT *, DBT *, u_int32_t));
+int __dbc_close __P((DBC *));
+int __dbc_destroy __P((DBC *));
+int __dbc_count __P((DBC *, db_recno_t *));
+int __dbc_del __P((DBC *, u_int32_t));
+int __dbc_dup __P((DBC *, DBC **, u_int32_t));
+int __dbc_idup __P((DBC *, DBC **, u_int32_t));
+int __dbc_newopd __P((DBC *, db_pgno_t, DBC *, DBC **));
+int __dbc_get __P((DBC *, DBT *, DBT *, u_int32_t));
+int __dbc_put __P((DBC *, DBT *, DBT *, u_int32_t));
 int __db_duperr __P((DB *, u_int32_t));
-int __db_c_secondary_get_pp __P((DBC *, DBT *, DBT *, u_int32_t));
-int __db_c_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
-int __db_c_del_primary __P((DBC *));
+int __dbc_secondary_get_pp __P((DBC *, DBT *, DBT *, u_int32_t));
+int __dbc_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
+int __dbc_del_primary __P((DBC *));
 int __db_s_first __P((DB *, DB **));
-int __db_s_next __P((DB **));
-int __db_s_done __P((DB *));
+int __db_s_next __P((DB **, DB_TXN *));
+int __db_s_done __P((DB *, DB_TXN *));
 u_int32_t __db_partsize __P((u_int32_t, DBT *));
+#ifdef DIAGNOSTIC
+void __db_check_skeyset __P((DB *, DBT *));
+#endif
 int __cdsgroup_begin __P((DB_ENV *, DB_TXN **));
 int __db_pgin __P((DB_ENV *, db_pgno_t, void *, DBT *));
 int __db_pgout __P((DB_ENV *, db_pgno_t, void *, DBT *));
+int __db_decrypt_pg __P((DB_ENV *, DB *, PAGE *));
+int __db_encrypt_and_checksum_pg __P((DB_ENV *, DB *, PAGE *));
 void __db_metaswap __P((PAGE *));
 int __db_byteswap __P((DB_ENV *, DB *, db_pgno_t, PAGE *, size_t, int));
 int __db_dispatch __P((DB_ENV *, int (**)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)), size_t, DBT *, DB_LSN *, db_recops, DB_TXNHEAD *));
@@ -135,6 +140,7 @@ int __db_close_pp __P((DB *, u_int32_t));
 int __db_cursor_pp __P((DB *, DB_TXN *, DBC **, u_int32_t));
 int __db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
 int __db_del_pp __P((DB *, DB_TXN *, DBT *, u_int32_t));
+int __db_exists __P((DB *, DB_TXN *, DBT *, u_int32_t));
 int __db_fd_pp __P((DB *, int *));
 int __db_get_pp __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
 int __db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
@@ -146,14 +152,14 @@ int __db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
 int __db_put_pp __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
 int __db_compact_pp __P((DB *, DB_TXN *, DBT *, DBT *, DB_COMPACT *, u_int32_t, DBT *));
 int __db_sync_pp __P((DB *, u_int32_t));
-int __db_c_close_pp __P((DBC *));
-int __db_c_count_pp __P((DBC *, db_recno_t *, u_int32_t));
-int __db_c_del_pp __P((DBC *, u_int32_t));
-int __db_c_dup_pp __P((DBC *, DBC **, u_int32_t));
-int __db_c_get_pp __P((DBC *, DBT *, DBT *, u_int32_t));
+int __dbc_close_pp __P((DBC *));
+int __dbc_count_pp __P((DBC *, db_recno_t *, u_int32_t));
+int __dbc_del_pp __P((DBC *, u_int32_t));
+int __dbc_dup_pp __P((DBC *, DBC **, u_int32_t));
+int __dbc_get_pp __P((DBC *, DBT *, DBT *, u_int32_t));
 int __db_secondary_close_pp __P((DB *, u_int32_t));
-int __db_c_pget_pp __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
-int __db_c_put_pp __P((DBC *, DBT *, DBT *, u_int32_t));
+int __dbc_pget_pp __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
+int __dbc_put_pp __P((DBC *, DBT *, DBT *, u_int32_t));
 int __db_txn_auto_init __P((DB_ENV *, DB_TXN **));
 int __db_txn_auto_resolve __P((DB_ENV *, DB_TXN *, int, int));
 int __dbt_usercopy __P((DB_ENV *, DBT *));
@@ -167,7 +173,7 @@ int __db_free __P((DBC *, PAGE *));
 void __db_freelist_pos __P((db_pgno_t, db_pgno_t *, u_int32_t, u_int32_t *));
 #endif
 #ifdef HAVE_FTRUNCATE
-int __db_pg_truncate __P((DB_MPOOLFILE *, DB_TXN *, struct pglist *list, DB_COMPACT *, u_int32_t *, db_pgno_t *, DB_LSN *, int));
+int __db_pg_truncate __P((DB *, DB_TXN *, struct pglist *list, DB_COMPACT *, u_int32_t *, db_pgno_t *, DB_LSN *, int));
 #endif
 #ifdef HAVE_FTRUNCATE
 int __db_free_truncate __P((DB *, DB_TXN *, u_int32_t, DB_COMPACT *, struct pglist **, u_int32_t *, db_pgno_t *));
@@ -175,6 +181,7 @@ int __db_free_truncate __P((DB *, DB_TXN *, u_int32_t, DB_COMPACT *, struct pgli
 int __db_lprint __P((DBC *));
 int __db_lget __P((DBC *, int, db_pgno_t, db_lockmode_t, u_int32_t, DB_LOCK *));
 int __db_lput __P((DBC *, DB_LOCK *));
+int __db_create_internal  __P((DB **, DB_ENV *, u_int32_t));
 int __dbh_am_chk __P((DB *, u_int32_t));
 int __db_get_flags __P((DB *, u_int32_t *));
 int  __db_set_flags __P((DB *, u_int32_t));
@@ -185,13 +192,14 @@ int __db_open __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t
 int __db_get_open_flags __P((DB *, u_int32_t *));
 int __db_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
 int __db_init_subdb __P((DB *, DB *, const char *, DB_TXN *));
-int __db_chk_meta __P((DB_ENV *, DB *, DBMETA *, int));
-int __db_meta_setup __P((DB_ENV *, DB *, const char *, DBMETA *, u_int32_t, int));
+int __db_chk_meta __P((DB_ENV *, DB *, DBMETA *, u_int32_t));
+int __db_meta_setup __P((DB_ENV *, DB *, const char *, DBMETA *, u_int32_t, u_int32_t));
 int __db_goff __P((DB *, DB_TXN *, DBT *, u_int32_t, db_pgno_t, void **, u_int32_t *));
 int __db_poff __P((DBC *, const DBT *, db_pgno_t *));
 int __db_ovref __P((DBC *, db_pgno_t));
 int __db_doff __P((DBC *, db_pgno_t));
 int __db_moff __P((DB *, DB_TXN *, const DBT *, db_pgno_t, u_int32_t, int (*)(DB *, const DBT *, const DBT *), int *));
+int __db_coff __P((DB *, DB_TXN *, const DBT *, const DBT *, int (*)(DB *, const DBT *, const DBT *), int *));
 int __db_vrfy_overflow __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
 int __db_vrfy_ovfl_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, u_int32_t));
 int __db_safe_goff __P((DB *, VRFY_DBINFO *, db_pgno_t, DBT *, void *, u_int32_t));
diff --git a/db/dbinc_auto/dbreg_ext.h b/db/dbinc_auto/dbreg_ext.h
index 6e7aa8487..cd7b554c9 100644
--- a/db/dbinc_auto/dbreg_ext.h
+++ b/db/dbinc_auto/dbreg_ext.h
@@ -8,11 +8,14 @@ extern "C" {
 
 int __dbreg_setup __P((DB *, const char *, u_int32_t));
 int __dbreg_teardown __P((DB *));
+int __dbreg_teardown_int __P((DB_ENV *, FNAME *));
 int __dbreg_new_id __P((DB *, DB_TXN *));
 int __dbreg_get_id __P((DB *, DB_TXN *, int32_t *));
 int __dbreg_assign_id __P((DB *, int32_t));
 int __dbreg_revoke_id __P((DB *, int, int32_t));
+int __dbreg_revoke_id_int __P((DB_ENV *, FNAME *, int, int, int32_t));
 int __dbreg_close_id __P((DB *, DB_TXN *, u_int32_t));
+int __dbreg_close_id_int __P((DB_ENV *, FNAME *, u_int32_t, int));
 int __dbreg_log_close __P((DB_ENV *, FNAME *, DB_TXN *, u_int32_t));
 int __dbreg_log_id __P((DB *, DB_TXN *, int32_t, int));
 int __dbreg_register_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, const DBT *, const DBT *, int32_t, DBTYPE, db_pgno_t, u_int32_t));
@@ -25,9 +28,11 @@ int __dbreg_stat_print __P((DB_ENV *, u_int32_t));
 void __dbreg_print_fname __P((DB_ENV *, FNAME *));
 int __dbreg_add_dbentry __P((DB_ENV *, DB_LOG *, DB *, int32_t));
 int __dbreg_rem_dbentry __P((DB_LOG *, int32_t));
-int __dbreg_log_files __P((DB_ENV *));
-int __dbreg_close_files __P((DB_ENV *));
-int __dbreg_invalidate_files __P((DB_ENV *));
+int __dbreg_log_files __P((DB_ENV *, u_int32_t));
+int __dbreg_close_files __P((DB_ENV *, int));
+int __dbreg_close_file __P((DB_ENV *, FNAME *));
+int __dbreg_mark_restored __P((DB_ENV *));
+int __dbreg_invalidate_files __P((DB_ENV *, int));
 int __dbreg_id_to_db __P((DB_ENV *, DB_TXN *, DB **, int32_t, int));
 int __dbreg_id_to_db_int __P((DB_ENV *, DB_TXN *, DB **, int32_t, int, int));
 int __dbreg_id_to_fname __P((DB_LOG *, int32_t, int, FNAME **));
diff --git a/db/dbinc_auto/env_ext.h b/db/dbinc_auto/env_ext.h
index 2e0882415..d1742ddea 100644
--- a/db/dbinc_auto/env_ext.h
+++ b/db/dbinc_auto/env_ext.h
@@ -6,14 +6,14 @@
 extern "C" {
 #endif
 
-void __db_shalloc_init __P((REGINFO *, size_t));
-size_t __db_shalloc_size __P((size_t, size_t));
-int __db_shalloc __P((REGINFO *, size_t, size_t, void *));
-void __db_shalloc_free __P((REGINFO *, void *));
-size_t __db_shalloc_sizeof __P((void *));
-u_int32_t __db_tablesize __P((u_int32_t));
-void __db_hashinit __P((void *, u_int32_t));
+void __env_alloc_init __P((REGINFO *, size_t));
+size_t __env_alloc_overhead __P((void));
+size_t __env_alloc_size __P((size_t));
+int __env_alloc __P((REGINFO *, size_t, void *));
+void __env_alloc_free __P((REGINFO *, void *));
+void __env_alloc_print __P((REGINFO *, u_int32_t));
 int __env_read_db_config __P((DB_ENV *));
+int __config_split __P((char *, char *[]));
 int __env_failchk_pp __P((DB_ENV *, u_int32_t));
 int __env_thread_init __P((DB_ENV *, int));
 int __env_set_state __P((DB_ENV *, DB_THREAD_INFO **, DB_THREAD_STATE));
@@ -43,6 +43,7 @@ int  __env_set_verbose __P((DB_ENV *, u_int32_t, int));
 int __db_mi_env __P((DB_ENV *, const char *));
 int __db_mi_open __P((DB_ENV *, const char *, int));
 int __db_env_config __P((DB_ENV *, char *, u_int32_t));
+int __db_appname __P((DB_ENV *, APPNAME, const char *, u_int32_t, DB_FH **, char **));
 int __env_open_pp __P((DB_ENV *, const char *, u_int32_t, int));
 int __env_open __P((DB_ENV *, const char *, u_int32_t, int));
 int __env_remove __P((DB_ENV *, const char *, u_int32_t));
@@ -50,17 +51,20 @@ int __env_config __P((DB_ENV *, const char *, u_int32_t, int));
 int __env_close_pp __P((DB_ENV *, u_int32_t));
 int __env_close __P((DB_ENV *, int));
 int __env_get_open_flags __P((DB_ENV *, u_int32_t *));
-int __db_appname __P((DB_ENV *, APPNAME, const char *, u_int32_t, DB_FH **, char **));
 int __db_apprec __P((DB_ENV *, DB_LSN *, DB_LSN *, int, u_int32_t));
 int    __log_backup __P((DB_ENV *, DB_LOGC *, DB_LSN *, DB_LSN *, u_int32_t));
 int __env_openfiles __P((DB_ENV *, DB_LOGC *, void *, DBT *, DB_LSN *, DB_LSN *, double, int));
 int __env_init_rec __P((DB_ENV *, u_int32_t));
-int __db_e_attach __P((DB_ENV *, u_int32_t *));
-int __db_e_golive __P((DB_ENV *));
-int __db_e_detach __P((DB_ENV *, int));
-int __db_e_remove __P((DB_ENV *, u_int32_t));
-int __db_r_attach __P((DB_ENV *, REGINFO *, size_t));
-int __db_r_detach __P((DB_ENV *, REGINFO *, int));
+int __env_attach __P((DB_ENV *, u_int32_t *, int, int));
+int __env_turn_on __P((DB_ENV *));
+int __env_turn_off __P((DB_ENV *, u_int32_t));
+void __env_panic_set __P((DB_ENV *, int));
+int __env_ref_increment __P((DB_ENV *));
+int __env_ref_decrement __P((DB_ENV *));
+int __env_detach __P((DB_ENV *, int));
+int __env_remove_env __P((DB_ENV *));
+int __env_region_attach __P((DB_ENV *, REGINFO *, size_t));
+int __env_region_detach __P((DB_ENV *, REGINFO *, int));
 int __envreg_register __P((DB_ENV *, int *));
 int __envreg_unregister __P((DB_ENV *, int));
 int __envreg_xunlock __P((DB_ENV *));
@@ -70,8 +74,38 @@ void __db_print_fileid __P((DB_ENV *, u_int8_t *, const char *));
 void __db_dl __P((DB_ENV *, const char *, u_long));
 void __db_dl_pct __P((DB_ENV *, const char *, u_long, int, const char *));
 void __db_dlbytes __P((DB_ENV *, const char *, u_long, u_long, u_long));
-void __db_print_reginfo __P((DB_ENV *, REGINFO *, const char *));
+void __db_print_reginfo __P((DB_ENV *, REGINFO *, const char *, u_int32_t));
 int __db_stat_not_built __P((DB_ENV *));
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_close __P((DB_ENV *));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_add_remote_site __P((DB_ENV *, const char *, u_int, int *, u_int32_t));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_get_ack_policy __P((DB_ENV *, int *));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_set_ack_policy __P((DB_ENV *, int));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_set_local_site __P((DB_ENV *, const char *, u_int, u_int32_t));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_site_list __P((DB_ENV *, u_int *, DB_REPMGR_SITE **));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_start __P((DB_ENV *, int, u_int32_t));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_stat_pp __P((DB_ENV *, DB_REPMGR_STAT **, u_int32_t));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_stat_print_pp __P((DB_ENV *, u_int32_t));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *));
+#endif
 
 #if defined(__cplusplus)
 }
diff --git a/db/dbinc_auto/fileops_auto.h b/db/dbinc_auto/fileops_auto.h
index 9b3a65649..91207bd9e 100644
--- a/db/dbinc_auto/fileops_auto.h
+++ b/db/dbinc_auto/fileops_auto.h
@@ -37,6 +37,7 @@ typedef struct ___fop_write_args {
 } __fop_write_args;
 
 #define	DB___fop_rename	146
+#define	DB___fop_rename_noundo	150
 typedef struct ___fop_rename_args {
 	u_int32_t type;
 	DB_TXN *txnp;
diff --git a/db/dbinc_auto/fileops_ext.h b/db/dbinc_auto/fileops_ext.h
index 25b2fe625..2c41b3628 100644
--- a/db/dbinc_auto/fileops_ext.h
+++ b/db/dbinc_auto/fileops_ext.h
@@ -13,6 +13,8 @@ int __fop_remove_read __P((DB_ENV *, void *, __fop_remove_args **));
 int __fop_write_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, u_int32_t, u_int32_t, db_pgno_t, u_int32_t, const DBT *, u_int32_t));
 int __fop_write_read __P((DB_ENV *, void *, __fop_write_args **));
 int __fop_rename_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t));
+int __fop_rename_noundo_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t));
+int __fop_rename_int_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t, u_int32_t));
 int __fop_rename_read __P((DB_ENV *, void *, __fop_rename_args **));
 int __fop_file_remove_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t, u_int32_t));
 int __fop_file_remove_read __P((DB_ENV *, void *, __fop_file_remove_args **));
@@ -25,14 +27,15 @@ int __fop_file_remove_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
 int __fop_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
 int __fop_create __P((DB_ENV *, DB_TXN *, DB_FH **, const char *, APPNAME, int, u_int32_t));
 int __fop_remove __P((DB_ENV *, DB_TXN *, u_int8_t *, const char *, APPNAME, u_int32_t));
-int __fop_write __P((DB_ENV *, DB_TXN *, const char *, APPNAME, DB_FH *, u_int32_t, db_pgno_t, u_int32_t, u_int8_t *, u_int32_t, u_int32_t, u_int32_t));
-int __fop_rename __P((DB_ENV *, DB_TXN *, const char *, const char *, u_int8_t *, APPNAME, u_int32_t));
+int __fop_write __P((DB_ENV *, DB_TXN *, const char *, APPNAME, DB_FH *, u_int32_t, db_pgno_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t));
+int __fop_rename __P((DB_ENV *, DB_TXN *, const char *, const char *, u_int8_t *, APPNAME, int, u_int32_t));
 int __fop_create_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
 int __fop_remove_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
 int __fop_write_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
 int __fop_rename_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
+int __fop_rename_noundo_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
 int __fop_file_remove_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_lock_handle __P((DB_ENV *, DB *, u_int32_t, db_lockmode_t, DB_LOCK *, u_int32_t));
+int __fop_lock_handle __P((DB_ENV *, DB *, DB_LOCKER *, db_lockmode_t, DB_LOCK *, u_int32_t));
 int __fop_file_setup __P((DB *, DB_TXN *, const char *, int, u_int32_t, u_int32_t *));
 int __fop_subdb_setup __P((DB *, DB_TXN *, const char *, const char *, int, u_int32_t));
 int __fop_remove_setup __P((DB *, DB_TXN *, const char *, u_int32_t));
diff --git a/db/dbinc_auto/hash_ext.h b/db/dbinc_auto/hash_ext.h
index f821675ae..8407f64fb 100644
--- a/db/dbinc_auto/hash_ext.h
+++ b/db/dbinc_auto/hash_ext.h
@@ -7,12 +7,12 @@ extern "C" {
 #endif
 
 int __ham_quick_delete __P((DBC *));
-int __ham_c_init __P((DBC *));
-int __ham_c_count __P((DBC *, db_recno_t *));
-int __ham_c_dup __P((DBC *, DBC *));
+int __hamc_init __P((DBC *));
+int __hamc_count __P((DBC *, db_recno_t *));
+int __hamc_dup __P((DBC *, DBC *));
 u_int32_t __ham_call_hash __P((DBC *, u_int8_t *, u_int32_t));
 int __ham_init_dbt __P((DB_ENV *, DBT *, u_int32_t, void **, u_int32_t *));
-int __ham_c_update __P((DBC *, u_int32_t, int, int));
+int __hamc_update __P((DBC *, u_int32_t, db_ham_curadj, int));
 int __ham_get_clist __P((DB *, db_pgno_t, u_int32_t, DBC ***));
 int __ham_insdel_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, u_int32_t, DB_LSN *, const DBT *, const DBT *));
 int __ham_insdel_read __P((DB_ENV *, void *, __ham_insdel_args **));
@@ -65,6 +65,7 @@ int __ham_dirty_meta __P((DBC *, u_int32_t));
 int __ham_db_create __P((DB *));
 int __ham_db_close __P((DB *));
 int __ham_get_h_ffactor __P((DB *, u_int32_t *));
+int __ham_set_h_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *)));
 int __ham_get_h_nelem __P((DB *, u_int32_t *));
 int __ham_open __P((DB *, DB_TXN *, const char * name, db_pgno_t, u_int32_t));
 int __ham_metachk __P((DB *, const char *, HMETA *));
@@ -77,14 +78,16 @@ int __ham_item_last __P((DBC *, db_lockmode_t, db_pgno_t *));
 int __ham_item_first __P((DBC *, db_lockmode_t, db_pgno_t *));
 int __ham_item_prev __P((DBC *, db_lockmode_t, db_pgno_t *));
 int __ham_item_next __P((DBC *, db_lockmode_t, db_pgno_t *));
-void __ham_putitem __P((DB *, PAGE *p, const DBT *, int));
-void __ham_reputpair  __P((DB *, PAGE *, u_int32_t, const DBT *, const DBT *));
+int __ham_insertpair __P((DB *, DB_TXN *, PAGE *p, db_indx_t *indxp, const DBT *, const DBT *, int, int));
+int __ham_getindex __P((DB *, DB_TXN *, PAGE *, const DBT *, int, int *, db_indx_t *));
+int __ham_verify_sorted_page __P((DB *, DB_TXN *, PAGE *));
+int __ham_sort_page __P((DB *, DB_TXN *, PAGE **, PAGE *));
 int __ham_del_pair __P((DBC *, int));
 int __ham_replpair __P((DBC *, DBT *, u_int32_t));
 void __ham_onpage_replace __P((DB *, PAGE *, u_int32_t, int32_t, u_int32_t,  int, DBT *));
 int __ham_split_page __P((DBC *, u_int32_t, u_int32_t));
 int __ham_add_el __P((DBC *, const DBT *, const DBT *, int));
-void __ham_copy_item __P((DB *, PAGE *, u_int32_t, PAGE *));
+int __ham_copypair __P((DB *, DB_TXN *, PAGE *, u_int32_t, PAGE *, db_indx_t *));
 int __ham_add_ovflpage __P((DBC *, PAGE *, int, PAGE **));
 int __ham_get_cpage __P((DBC *, db_lockmode_t));
 int __ham_next_cpage __P((DBC *, db_pgno_t));
@@ -112,6 +115,8 @@ int __ham_30_hashmeta __P((DB *, char *, u_int8_t *));
 int __ham_30_sizefix __P((DB *, DB_FH *, char *, u_int8_t *));
 int __ham_31_hashmeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
 int __ham_31_hash __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
+int __ham_46_hashmeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
+int __ham_46_hash __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
 int __ham_vrfy_meta __P((DB *, VRFY_DBINFO *, HMETA *, db_pgno_t, u_int32_t));
 int __ham_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
 int __ham_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
diff --git a/db/dbinc_auto/int_def.in b/db/dbinc_auto/int_def.in
index f88b35dd2..8b59c85d8 100644
--- a/db/dbinc_auto/int_def.in
+++ b/db/dbinc_auto/int_def.in
@@ -22,8 +22,8 @@
 #define	__crdel_inmem_remove_recover __crdel_inmem_remove_recover@DB_VERSION_UNIQUE_NAME@
 #define	__db_master_open __db_master_open@DB_VERSION_UNIQUE_NAME@
 #define	__db_master_update __db_master_update@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbenv_setup __db_dbenv_setup@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbenv_mpool __db_dbenv_mpool@DB_VERSION_UNIQUE_NAME@
+#define	__db_env_setup __db_env_setup@DB_VERSION_UNIQUE_NAME@
+#define	__db_env_mpool __db_env_mpool@DB_VERSION_UNIQUE_NAME@
 #define	__db_close __db_close@DB_VERSION_UNIQUE_NAME@
 #define	__db_refresh __db_refresh@DB_VERSION_UNIQUE_NAME@
 #define	__db_log_page __db_log_page@DB_VERSION_UNIQUE_NAME@
@@ -86,26 +86,31 @@
 #define	__db_pg_init_print __db_pg_init_print@DB_VERSION_UNIQUE_NAME@
 #define	__db_pg_sort_print __db_pg_sort_print@DB_VERSION_UNIQUE_NAME@
 #define	__db_init_print __db_init_print@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_close __db_c_close@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_destroy __db_c_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_count __db_c_count@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_del __db_c_del@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_dup __db_c_dup@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_idup __db_c_idup@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_newopd __db_c_newopd@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_get __db_c_get@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_put __db_c_put@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_close __dbc_close@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_destroy __dbc_destroy@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_count __dbc_count@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_del __dbc_del@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_dup __dbc_dup@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_idup __dbc_idup@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_newopd __dbc_newopd@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_get __dbc_get@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_put __dbc_put@DB_VERSION_UNIQUE_NAME@
 #define	__db_duperr __db_duperr@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_secondary_get_pp __db_c_secondary_get_pp@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_pget __db_c_pget@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_del_primary __db_c_del_primary@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_secondary_get_pp __dbc_secondary_get_pp@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_pget __dbc_pget@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_del_primary __dbc_del_primary@DB_VERSION_UNIQUE_NAME@
 #define	__db_s_first __db_s_first@DB_VERSION_UNIQUE_NAME@
 #define	__db_s_next __db_s_next@DB_VERSION_UNIQUE_NAME@
 #define	__db_s_done __db_s_done@DB_VERSION_UNIQUE_NAME@
 #define	__db_partsize __db_partsize@DB_VERSION_UNIQUE_NAME@
+#ifdef DIAGNOSTIC
+#define	__db_check_skeyset __db_check_skeyset@DB_VERSION_UNIQUE_NAME@
+#endif
 #define	__cdsgroup_begin __cdsgroup_begin@DB_VERSION_UNIQUE_NAME@
 #define	__db_pgin __db_pgin@DB_VERSION_UNIQUE_NAME@
 #define	__db_pgout __db_pgout@DB_VERSION_UNIQUE_NAME@
+#define	__db_decrypt_pg __db_decrypt_pg@DB_VERSION_UNIQUE_NAME@
+#define	__db_encrypt_and_checksum_pg __db_encrypt_and_checksum_pg@DB_VERSION_UNIQUE_NAME@
 #define	__db_metaswap __db_metaswap@DB_VERSION_UNIQUE_NAME@
 #define	__db_byteswap __db_byteswap@DB_VERSION_UNIQUE_NAME@
 #define	__db_dispatch __db_dispatch@DB_VERSION_UNIQUE_NAME@
@@ -131,6 +136,7 @@
 #define	__db_cursor_pp __db_cursor_pp@DB_VERSION_UNIQUE_NAME@
 #define	__db_cursor __db_cursor@DB_VERSION_UNIQUE_NAME@
 #define	__db_del_pp __db_del_pp@DB_VERSION_UNIQUE_NAME@
+#define	__db_exists __db_exists@DB_VERSION_UNIQUE_NAME@
 #define	__db_fd_pp __db_fd_pp@DB_VERSION_UNIQUE_NAME@
 #define	__db_get_pp __db_get_pp@DB_VERSION_UNIQUE_NAME@
 #define	__db_get __db_get@DB_VERSION_UNIQUE_NAME@
@@ -142,14 +148,14 @@
 #define	__db_put_pp __db_put_pp@DB_VERSION_UNIQUE_NAME@
 #define	__db_compact_pp __db_compact_pp@DB_VERSION_UNIQUE_NAME@
 #define	__db_sync_pp __db_sync_pp@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_close_pp __db_c_close_pp@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_count_pp __db_c_count_pp@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_del_pp __db_c_del_pp@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_dup_pp __db_c_dup_pp@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_get_pp __db_c_get_pp@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_close_pp __dbc_close_pp@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_count_pp __dbc_count_pp@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_del_pp __dbc_del_pp@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_dup_pp __dbc_dup_pp@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_get_pp __dbc_get_pp@DB_VERSION_UNIQUE_NAME@
 #define	__db_secondary_close_pp __db_secondary_close_pp@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_pget_pp __db_c_pget_pp@DB_VERSION_UNIQUE_NAME@
-#define	__db_c_put_pp __db_c_put_pp@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_pget_pp __dbc_pget_pp@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_put_pp __dbc_put_pp@DB_VERSION_UNIQUE_NAME@
 #define	__db_txn_auto_init __db_txn_auto_init@DB_VERSION_UNIQUE_NAME@
 #define	__db_txn_auto_resolve __db_txn_auto_resolve@DB_VERSION_UNIQUE_NAME@
 #define	__dbt_usercopy __dbt_usercopy@DB_VERSION_UNIQUE_NAME@
@@ -171,6 +177,7 @@
 #define	__db_lprint __db_lprint@DB_VERSION_UNIQUE_NAME@
 #define	__db_lget __db_lget@DB_VERSION_UNIQUE_NAME@
 #define	__db_lput __db_lput@DB_VERSION_UNIQUE_NAME@
+#define	__db_create_internal __db_create_internal@DB_VERSION_UNIQUE_NAME@
 #define	__dbh_am_chk __dbh_am_chk@DB_VERSION_UNIQUE_NAME@
 #define	__db_get_flags __db_get_flags@DB_VERSION_UNIQUE_NAME@
 #define	__db_set_flags __db_set_flags@DB_VERSION_UNIQUE_NAME@
@@ -188,6 +195,7 @@
 #define	__db_ovref __db_ovref@DB_VERSION_UNIQUE_NAME@
 #define	__db_doff __db_doff@DB_VERSION_UNIQUE_NAME@
 #define	__db_moff __db_moff@DB_VERSION_UNIQUE_NAME@
+#define	__db_coff __db_coff@DB_VERSION_UNIQUE_NAME@
 #define	__db_vrfy_overflow __db_vrfy_overflow@DB_VERSION_UNIQUE_NAME@
 #define	__db_vrfy_ovfl_structure __db_vrfy_ovfl_structure@DB_VERSION_UNIQUE_NAME@
 #define	__db_safe_goff __db_safe_goff@DB_VERSION_UNIQUE_NAME@
@@ -296,13 +304,13 @@
 #define	__bam_ca_rsplit __bam_ca_rsplit@DB_VERSION_UNIQUE_NAME@
 #define	__bam_ca_split __bam_ca_split@DB_VERSION_UNIQUE_NAME@
 #define	__bam_ca_undosplit __bam_ca_undosplit@DB_VERSION_UNIQUE_NAME@
-#define	__bam_c_init __bam_c_init@DB_VERSION_UNIQUE_NAME@
-#define	__bam_c_refresh __bam_c_refresh@DB_VERSION_UNIQUE_NAME@
-#define	__bam_c_count __bam_c_count@DB_VERSION_UNIQUE_NAME@
-#define	__bam_c_dup __bam_c_dup@DB_VERSION_UNIQUE_NAME@
+#define	__bamc_init __bamc_init@DB_VERSION_UNIQUE_NAME@
+#define	__bamc_refresh __bamc_refresh@DB_VERSION_UNIQUE_NAME@
+#define	__bamc_count __bamc_count@DB_VERSION_UNIQUE_NAME@
+#define	__bamc_dup __bamc_dup@DB_VERSION_UNIQUE_NAME@
 #define	__bam_bulk_overflow __bam_bulk_overflow@DB_VERSION_UNIQUE_NAME@
 #define	__bam_bulk_duplicates __bam_bulk_duplicates@DB_VERSION_UNIQUE_NAME@
-#define	__bam_c_rget __bam_c_rget@DB_VERSION_UNIQUE_NAME@
+#define	__bamc_rget __bamc_rget@DB_VERSION_UNIQUE_NAME@
 #define	__bam_opd_exists __bam_opd_exists@DB_VERSION_UNIQUE_NAME@
 #define	__bam_ditem __bam_ditem@DB_VERSION_UNIQUE_NAME@
 #define	__bam_adjindx __bam_adjindx@DB_VERSION_UNIQUE_NAME@
@@ -343,9 +351,9 @@
 #define	__bam_truncate __bam_truncate@DB_VERSION_UNIQUE_NAME@
 #define	__ram_open __ram_open@DB_VERSION_UNIQUE_NAME@
 #define	__ram_append __ram_append@DB_VERSION_UNIQUE_NAME@
-#define	__ram_c_del __ram_c_del@DB_VERSION_UNIQUE_NAME@
-#define	__ram_c_get __ram_c_get@DB_VERSION_UNIQUE_NAME@
-#define	__ram_c_put __ram_c_put@DB_VERSION_UNIQUE_NAME@
+#define	__ramc_del __ramc_del@DB_VERSION_UNIQUE_NAME@
+#define	__ramc_get __ramc_get@DB_VERSION_UNIQUE_NAME@
+#define	__ramc_put __ramc_put@DB_VERSION_UNIQUE_NAME@
 #define	__ram_ca __ram_ca@DB_VERSION_UNIQUE_NAME@
 #define	__ram_getno __ram_getno@DB_VERSION_UNIQUE_NAME@
 #define	__ram_writeback __ram_writeback@DB_VERSION_UNIQUE_NAME@
@@ -418,9 +426,6 @@
 #define	__bam_merge_print __bam_merge_print@DB_VERSION_UNIQUE_NAME@
 #define	__bam_pgno_print __bam_pgno_print@DB_VERSION_UNIQUE_NAME@
 #define	__bam_init_print __bam_init_print@DB_VERSION_UNIQUE_NAME@
-#ifndef HAVE_ABORT
-#define	abort abort@DB_VERSION_UNIQUE_NAME@
-#endif
 #ifndef HAVE_ATOI
 #define	atoi atoi@DB_VERSION_UNIQUE_NAME@
 #endif
@@ -470,6 +475,9 @@
 #ifndef HAVE_PRINTF
 #define	vfprintf vfprintf@DB_VERSION_UNIQUE_NAME@
 #endif
+#ifndef HAVE_QSORT
+#define	qsort qsort@DB_VERSION_UNIQUE_NAME@
+#endif
 #ifndef HAVE_RAISE
 #define	raise raise@DB_VERSION_UNIQUE_NAME@
 #endif
@@ -522,7 +530,6 @@
 #define	__crypto_region_init __crypto_region_init@DB_VERSION_UNIQUE_NAME@
 #define	__db_isbigendian __db_isbigendian@DB_VERSION_UNIQUE_NAME@
 #define	__db_byteorder __db_byteorder@DB_VERSION_UNIQUE_NAME@
-#define	__db_difftime __db_difftime@DB_VERSION_UNIQUE_NAME@
 #define	__db_fchk __db_fchk@DB_VERSION_UNIQUE_NAME@
 #define	__db_fcchk __db_fcchk@DB_VERSION_UNIQUE_NAME@
 #define	__db_ferr __db_ferr@DB_VERSION_UNIQUE_NAME@
@@ -534,7 +541,6 @@
 #endif
 #define	__db_panic_msg __db_panic_msg@DB_VERSION_UNIQUE_NAME@
 #define	__db_panic __db_panic@DB_VERSION_UNIQUE_NAME@
-#define	__db_panic_set __db_panic_set@DB_VERSION_UNIQUE_NAME@
 #define	__db_unknown_error __db_unknown_error@DB_VERSION_UNIQUE_NAME@
 #define	__db_syserr __db_syserr@DB_VERSION_UNIQUE_NAME@
 #define	__db_err __db_err@DB_VERSION_UNIQUE_NAME@
@@ -542,6 +548,7 @@
 #define	__db_errcall __db_errcall@DB_VERSION_UNIQUE_NAME@
 #define	__db_errfile __db_errfile@DB_VERSION_UNIQUE_NAME@
 #define	__db_msgadd __db_msgadd@DB_VERSION_UNIQUE_NAME@
+#define	__db_msgadd_ap __db_msgadd_ap@DB_VERSION_UNIQUE_NAME@
 #define	__db_msg __db_msg@DB_VERSION_UNIQUE_NAME@
 #define	__db_unknown_flag __db_unknown_flag@DB_VERSION_UNIQUE_NAME@
 #define	__db_unknown_type __db_unknown_type@DB_VERSION_UNIQUE_NAME@
@@ -560,6 +567,8 @@
 #define	__db_getulong __db_getulong@DB_VERSION_UNIQUE_NAME@
 #define	__db_idspace __db_idspace@DB_VERSION_UNIQUE_NAME@
 #define	__db_log2 __db_log2@DB_VERSION_UNIQUE_NAME@
+#define	__db_tablesize __db_tablesize@DB_VERSION_UNIQUE_NAME@
+#define	__db_hashinit __db_hashinit@DB_VERSION_UNIQUE_NAME@
 #define	__db_mkpath __db_mkpath@DB_VERSION_UNIQUE_NAME@
 #define	__db_util_arg __db_util_arg@DB_VERSION_UNIQUE_NAME@
 #define	__db_util_cache __db_util_cache@DB_VERSION_UNIQUE_NAME@
@@ -573,8 +582,8 @@
 #define	__aes_decrypt __aes_decrypt@DB_VERSION_UNIQUE_NAME@
 #define	__aes_encrypt __aes_encrypt@DB_VERSION_UNIQUE_NAME@
 #define	__aes_init __aes_init@DB_VERSION_UNIQUE_NAME@
-#define	__crypto_dbenv_close __crypto_dbenv_close@DB_VERSION_UNIQUE_NAME@
-#define	__crypto_region_destroy __crypto_region_destroy@DB_VERSION_UNIQUE_NAME@
+#define	__crypto_env_close __crypto_env_close@DB_VERSION_UNIQUE_NAME@
+#define	__crypto_env_refresh __crypto_env_refresh@DB_VERSION_UNIQUE_NAME@
 #define	__crypto_algsetup __crypto_algsetup@DB_VERSION_UNIQUE_NAME@
 #define	__crypto_decrypt_meta __crypto_decrypt_meta@DB_VERSION_UNIQUE_NAME@
 #define	__crypto_set_passwd __crypto_set_passwd@DB_VERSION_UNIQUE_NAME@
@@ -594,11 +603,14 @@
 #define	__db_cipherUpdateRounds __db_cipherUpdateRounds@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_setup __dbreg_setup@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_teardown __dbreg_teardown@DB_VERSION_UNIQUE_NAME@
+#define	__dbreg_teardown_int __dbreg_teardown_int@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_new_id __dbreg_new_id@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_get_id __dbreg_get_id@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_assign_id __dbreg_assign_id@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_revoke_id __dbreg_revoke_id@DB_VERSION_UNIQUE_NAME@
+#define	__dbreg_revoke_id_int __dbreg_revoke_id_int@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_close_id __dbreg_close_id@DB_VERSION_UNIQUE_NAME@
+#define	__dbreg_close_id_int __dbreg_close_id_int@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_log_close __dbreg_log_close@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_log_id __dbreg_log_id@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_register_log __dbreg_register_log@DB_VERSION_UNIQUE_NAME@
@@ -613,6 +625,8 @@
 #define	__dbreg_rem_dbentry __dbreg_rem_dbentry@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_log_files __dbreg_log_files@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_close_files __dbreg_close_files@DB_VERSION_UNIQUE_NAME@
+#define	__dbreg_close_file __dbreg_close_file@DB_VERSION_UNIQUE_NAME@
+#define	__dbreg_mark_restored __dbreg_mark_restored@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_invalidate_files __dbreg_invalidate_files@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_id_to_db __dbreg_id_to_db@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_id_to_db_int __dbreg_id_to_db_int@DB_VERSION_UNIQUE_NAME@
@@ -621,14 +635,14 @@
 #define	__dbreg_get_name __dbreg_get_name@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_do_open __dbreg_do_open@DB_VERSION_UNIQUE_NAME@
 #define	__dbreg_lazy_id __dbreg_lazy_id@DB_VERSION_UNIQUE_NAME@
-#define	__db_shalloc_init __db_shalloc_init@DB_VERSION_UNIQUE_NAME@
-#define	__db_shalloc_size __db_shalloc_size@DB_VERSION_UNIQUE_NAME@
-#define	__db_shalloc __db_shalloc@DB_VERSION_UNIQUE_NAME@
-#define	__db_shalloc_free __db_shalloc_free@DB_VERSION_UNIQUE_NAME@
-#define	__db_shalloc_sizeof __db_shalloc_sizeof@DB_VERSION_UNIQUE_NAME@
-#define	__db_tablesize __db_tablesize@DB_VERSION_UNIQUE_NAME@
-#define	__db_hashinit __db_hashinit@DB_VERSION_UNIQUE_NAME@
+#define	__env_alloc_init __env_alloc_init@DB_VERSION_UNIQUE_NAME@
+#define	__env_alloc_overhead __env_alloc_overhead@DB_VERSION_UNIQUE_NAME@
+#define	__env_alloc_size __env_alloc_size@DB_VERSION_UNIQUE_NAME@
+#define	__env_alloc __env_alloc@DB_VERSION_UNIQUE_NAME@
+#define	__env_alloc_free __env_alloc_free@DB_VERSION_UNIQUE_NAME@
+#define	__env_alloc_print __env_alloc_print@DB_VERSION_UNIQUE_NAME@
 #define	__env_read_db_config __env_read_db_config@DB_VERSION_UNIQUE_NAME@
+#define	__config_split __config_split@DB_VERSION_UNIQUE_NAME@
 #define	__env_failchk_pp __env_failchk_pp@DB_VERSION_UNIQUE_NAME@
 #define	__env_thread_init __env_thread_init@DB_VERSION_UNIQUE_NAME@
 #define	__env_set_state __env_set_state@DB_VERSION_UNIQUE_NAME@
@@ -658,6 +672,7 @@
 #define	__db_mi_env __db_mi_env@DB_VERSION_UNIQUE_NAME@
 #define	__db_mi_open __db_mi_open@DB_VERSION_UNIQUE_NAME@
 #define	__db_env_config __db_env_config@DB_VERSION_UNIQUE_NAME@
+#define	__db_appname __db_appname@DB_VERSION_UNIQUE_NAME@
 #define	__env_open_pp __env_open_pp@DB_VERSION_UNIQUE_NAME@
 #define	__env_open __env_open@DB_VERSION_UNIQUE_NAME@
 #define	__env_remove __env_remove@DB_VERSION_UNIQUE_NAME@
@@ -665,17 +680,20 @@
 #define	__env_close_pp __env_close_pp@DB_VERSION_UNIQUE_NAME@
 #define	__env_close __env_close@DB_VERSION_UNIQUE_NAME@
 #define	__env_get_open_flags __env_get_open_flags@DB_VERSION_UNIQUE_NAME@
-#define	__db_appname __db_appname@DB_VERSION_UNIQUE_NAME@
 #define	__db_apprec __db_apprec@DB_VERSION_UNIQUE_NAME@
 #define	__log_backup __log_backup@DB_VERSION_UNIQUE_NAME@
 #define	__env_openfiles __env_openfiles@DB_VERSION_UNIQUE_NAME@
 #define	__env_init_rec __env_init_rec@DB_VERSION_UNIQUE_NAME@
-#define	__db_e_attach __db_e_attach@DB_VERSION_UNIQUE_NAME@
-#define	__db_e_golive __db_e_golive@DB_VERSION_UNIQUE_NAME@
-#define	__db_e_detach __db_e_detach@DB_VERSION_UNIQUE_NAME@
-#define	__db_e_remove __db_e_remove@DB_VERSION_UNIQUE_NAME@
-#define	__db_r_attach __db_r_attach@DB_VERSION_UNIQUE_NAME@
-#define	__db_r_detach __db_r_detach@DB_VERSION_UNIQUE_NAME@
+#define	__env_attach __env_attach@DB_VERSION_UNIQUE_NAME@
+#define	__env_turn_on __env_turn_on@DB_VERSION_UNIQUE_NAME@
+#define	__env_turn_off __env_turn_off@DB_VERSION_UNIQUE_NAME@
+#define	__env_panic_set __env_panic_set@DB_VERSION_UNIQUE_NAME@
+#define	__env_ref_increment __env_ref_increment@DB_VERSION_UNIQUE_NAME@
+#define	__env_ref_decrement __env_ref_decrement@DB_VERSION_UNIQUE_NAME@
+#define	__env_detach __env_detach@DB_VERSION_UNIQUE_NAME@
+#define	__env_remove_env __env_remove_env@DB_VERSION_UNIQUE_NAME@
+#define	__env_region_attach __env_region_attach@DB_VERSION_UNIQUE_NAME@
+#define	__env_region_detach __env_region_detach@DB_VERSION_UNIQUE_NAME@
 #define	__envreg_register __envreg_register@DB_VERSION_UNIQUE_NAME@
 #define	__envreg_unregister __envreg_unregister@DB_VERSION_UNIQUE_NAME@
 #define	__envreg_xunlock __envreg_xunlock@DB_VERSION_UNIQUE_NAME@
@@ -687,6 +705,36 @@
 #define	__db_dlbytes __db_dlbytes@DB_VERSION_UNIQUE_NAME@
 #define	__db_print_reginfo __db_print_reginfo@DB_VERSION_UNIQUE_NAME@
 #define	__db_stat_not_built __db_stat_not_built@DB_VERSION_UNIQUE_NAME@
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_close __repmgr_close@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_add_remote_site __repmgr_add_remote_site@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_get_ack_policy __repmgr_get_ack_policy@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_set_ack_policy __repmgr_set_ack_policy@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_set_local_site __repmgr_set_local_site@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_site_list __repmgr_site_list@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_start __repmgr_start@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_stat_pp __repmgr_stat_pp@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_stat_print_pp __repmgr_stat_print_pp@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_handle_event __repmgr_handle_event@DB_VERSION_UNIQUE_NAME@
+#endif
 #define	__fop_create_log __fop_create_log@DB_VERSION_UNIQUE_NAME@
 #define	__fop_create_read __fop_create_read@DB_VERSION_UNIQUE_NAME@
 #define	__fop_remove_log __fop_remove_log@DB_VERSION_UNIQUE_NAME@
@@ -694,6 +742,8 @@
 #define	__fop_write_log __fop_write_log@DB_VERSION_UNIQUE_NAME@
 #define	__fop_write_read __fop_write_read@DB_VERSION_UNIQUE_NAME@
 #define	__fop_rename_log __fop_rename_log@DB_VERSION_UNIQUE_NAME@
+#define	__fop_rename_noundo_log __fop_rename_noundo_log@DB_VERSION_UNIQUE_NAME@
+#define	__fop_rename_int_log __fop_rename_int_log@DB_VERSION_UNIQUE_NAME@
 #define	__fop_rename_read __fop_rename_read@DB_VERSION_UNIQUE_NAME@
 #define	__fop_file_remove_log __fop_file_remove_log@DB_VERSION_UNIQUE_NAME@
 #define	__fop_file_remove_read __fop_file_remove_read@DB_VERSION_UNIQUE_NAME@
@@ -712,6 +762,7 @@
 #define	__fop_remove_recover __fop_remove_recover@DB_VERSION_UNIQUE_NAME@
 #define	__fop_write_recover __fop_write_recover@DB_VERSION_UNIQUE_NAME@
 #define	__fop_rename_recover __fop_rename_recover@DB_VERSION_UNIQUE_NAME@
+#define	__fop_rename_noundo_recover __fop_rename_noundo_recover@DB_VERSION_UNIQUE_NAME@
 #define	__fop_file_remove_recover __fop_file_remove_recover@DB_VERSION_UNIQUE_NAME@
 #define	__fop_lock_handle __fop_lock_handle@DB_VERSION_UNIQUE_NAME@
 #define	__fop_file_setup __fop_file_setup@DB_VERSION_UNIQUE_NAME@
@@ -721,12 +772,12 @@
 #define	__fop_dummy __fop_dummy@DB_VERSION_UNIQUE_NAME@
 #define	__fop_dbrename __fop_dbrename@DB_VERSION_UNIQUE_NAME@
 #define	__ham_quick_delete __ham_quick_delete@DB_VERSION_UNIQUE_NAME@
-#define	__ham_c_init __ham_c_init@DB_VERSION_UNIQUE_NAME@
-#define	__ham_c_count __ham_c_count@DB_VERSION_UNIQUE_NAME@
-#define	__ham_c_dup __ham_c_dup@DB_VERSION_UNIQUE_NAME@
+#define	__hamc_init __hamc_init@DB_VERSION_UNIQUE_NAME@
+#define	__hamc_count __hamc_count@DB_VERSION_UNIQUE_NAME@
+#define	__hamc_dup __hamc_dup@DB_VERSION_UNIQUE_NAME@
 #define	__ham_call_hash __ham_call_hash@DB_VERSION_UNIQUE_NAME@
 #define	__ham_init_dbt __ham_init_dbt@DB_VERSION_UNIQUE_NAME@
-#define	__ham_c_update __ham_c_update@DB_VERSION_UNIQUE_NAME@
+#define	__hamc_update __hamc_update@DB_VERSION_UNIQUE_NAME@
 #define	__ham_get_clist __ham_get_clist@DB_VERSION_UNIQUE_NAME@
 #define	__ham_insdel_log __ham_insdel_log@DB_VERSION_UNIQUE_NAME@
 #define	__ham_insdel_read __ham_insdel_read@DB_VERSION_UNIQUE_NAME@
@@ -779,6 +830,7 @@
 #define	__ham_db_create __ham_db_create@DB_VERSION_UNIQUE_NAME@
 #define	__ham_db_close __ham_db_close@DB_VERSION_UNIQUE_NAME@
 #define	__ham_get_h_ffactor __ham_get_h_ffactor@DB_VERSION_UNIQUE_NAME@
+#define	__ham_set_h_compare __ham_set_h_compare@DB_VERSION_UNIQUE_NAME@
 #define	__ham_get_h_nelem __ham_get_h_nelem@DB_VERSION_UNIQUE_NAME@
 #define	__ham_open __ham_open@DB_VERSION_UNIQUE_NAME@
 #define	__ham_metachk __ham_metachk@DB_VERSION_UNIQUE_NAME@
@@ -791,14 +843,16 @@
 #define	__ham_item_first __ham_item_first@DB_VERSION_UNIQUE_NAME@
 #define	__ham_item_prev __ham_item_prev@DB_VERSION_UNIQUE_NAME@
 #define	__ham_item_next __ham_item_next@DB_VERSION_UNIQUE_NAME@
-#define	__ham_putitem __ham_putitem@DB_VERSION_UNIQUE_NAME@
-#define	__ham_reputpair __ham_reputpair@DB_VERSION_UNIQUE_NAME@
+#define	__ham_insertpair __ham_insertpair@DB_VERSION_UNIQUE_NAME@
+#define	__ham_getindex __ham_getindex@DB_VERSION_UNIQUE_NAME@
+#define	__ham_verify_sorted_page __ham_verify_sorted_page@DB_VERSION_UNIQUE_NAME@
+#define	__ham_sort_page __ham_sort_page@DB_VERSION_UNIQUE_NAME@
 #define	__ham_del_pair __ham_del_pair@DB_VERSION_UNIQUE_NAME@
 #define	__ham_replpair __ham_replpair@DB_VERSION_UNIQUE_NAME@
 #define	__ham_onpage_replace __ham_onpage_replace@DB_VERSION_UNIQUE_NAME@
 #define	__ham_split_page __ham_split_page@DB_VERSION_UNIQUE_NAME@
 #define	__ham_add_el __ham_add_el@DB_VERSION_UNIQUE_NAME@
-#define	__ham_copy_item __ham_copy_item@DB_VERSION_UNIQUE_NAME@
+#define	__ham_copypair __ham_copypair@DB_VERSION_UNIQUE_NAME@
 #define	__ham_add_ovflpage __ham_add_ovflpage@DB_VERSION_UNIQUE_NAME@
 #define	__ham_get_cpage __ham_get_cpage@DB_VERSION_UNIQUE_NAME@
 #define	__ham_next_cpage __ham_next_cpage@DB_VERSION_UNIQUE_NAME@
@@ -826,6 +880,8 @@
 #define	__ham_30_sizefix __ham_30_sizefix@DB_VERSION_UNIQUE_NAME@
 #define	__ham_31_hashmeta __ham_31_hashmeta@DB_VERSION_UNIQUE_NAME@
 #define	__ham_31_hash __ham_31_hash@DB_VERSION_UNIQUE_NAME@
+#define	__ham_46_hashmeta __ham_46_hashmeta@DB_VERSION_UNIQUE_NAME@
+#define	__ham_46_hash __ham_46_hash@DB_VERSION_UNIQUE_NAME@
 #define	__ham_vrfy_meta __ham_vrfy_meta@DB_VERSION_UNIQUE_NAME@
 #define	__ham_vrfy __ham_vrfy@DB_VERSION_UNIQUE_NAME@
 #define	__ham_vrfy_structure __ham_vrfy_structure@DB_VERSION_UNIQUE_NAME@
@@ -859,14 +915,15 @@
 #define	__lock_id_free __lock_id_free@DB_VERSION_UNIQUE_NAME@
 #define	__lock_id_set __lock_id_set@DB_VERSION_UNIQUE_NAME@
 #define	__lock_getlocker __lock_getlocker@DB_VERSION_UNIQUE_NAME@
+#define	__lock_getlocker_int __lock_getlocker_int@DB_VERSION_UNIQUE_NAME@
 #define	__lock_addfamilylocker __lock_addfamilylocker@DB_VERSION_UNIQUE_NAME@
 #define	__lock_freefamilylocker __lock_freefamilylocker@DB_VERSION_UNIQUE_NAME@
 #define	__lock_freelocker __lock_freelocker@DB_VERSION_UNIQUE_NAME@
 #define	__lock_fix_list __lock_fix_list@DB_VERSION_UNIQUE_NAME@
 #define	__lock_get_list __lock_get_list@DB_VERSION_UNIQUE_NAME@
 #define	__lock_list_print __lock_list_print@DB_VERSION_UNIQUE_NAME@
-#define	__lock_dbenv_create __lock_dbenv_create@DB_VERSION_UNIQUE_NAME@
-#define	__lock_dbenv_destroy __lock_dbenv_destroy@DB_VERSION_UNIQUE_NAME@
+#define	__lock_env_create __lock_env_create@DB_VERSION_UNIQUE_NAME@
+#define	__lock_env_destroy __lock_env_destroy@DB_VERSION_UNIQUE_NAME@
 #define	__lock_get_lk_conflicts __lock_get_lk_conflicts@DB_VERSION_UNIQUE_NAME@
 #define	__lock_set_lk_conflicts __lock_set_lk_conflicts@DB_VERSION_UNIQUE_NAME@
 #define	__lock_get_lk_detect __lock_get_lk_detect@DB_VERSION_UNIQUE_NAME@
@@ -880,7 +937,7 @@
 #define	__lock_get_env_timeout __lock_get_env_timeout@DB_VERSION_UNIQUE_NAME@
 #define	__lock_set_env_timeout __lock_set_env_timeout@DB_VERSION_UNIQUE_NAME@
 #define	__lock_open __lock_open@DB_VERSION_UNIQUE_NAME@
-#define	__lock_dbenv_refresh __lock_dbenv_refresh@DB_VERSION_UNIQUE_NAME@
+#define	__lock_env_refresh __lock_env_refresh@DB_VERSION_UNIQUE_NAME@
 #define	__lock_region_mutex_count __lock_region_mutex_count@DB_VERSION_UNIQUE_NAME@
 #define	__lock_stat_pp __lock_stat_pp@DB_VERSION_UNIQUE_NAME@
 #define	__lock_stat_print_pp __lock_stat_print_pp@DB_VERSION_UNIQUE_NAME@
@@ -897,7 +954,7 @@
 #define	__log_open __log_open@DB_VERSION_UNIQUE_NAME@
 #define	__log_find __log_find@DB_VERSION_UNIQUE_NAME@
 #define	__log_valid __log_valid@DB_VERSION_UNIQUE_NAME@
-#define	__log_dbenv_refresh __log_dbenv_refresh@DB_VERSION_UNIQUE_NAME@
+#define	__log_env_refresh __log_env_refresh@DB_VERSION_UNIQUE_NAME@
 #define	__log_get_cached_ckp_lsn __log_get_cached_ckp_lsn@DB_VERSION_UNIQUE_NAME@
 #define	__log_region_mutex_count __log_region_mutex_count@DB_VERSION_UNIQUE_NAME@
 #define	__log_vtruncate __log_vtruncate@DB_VERSION_UNIQUE_NAME@
@@ -919,12 +976,12 @@
 #define	__log_printf __log_printf@DB_VERSION_UNIQUE_NAME@
 #define	__log_cursor_pp __log_cursor_pp@DB_VERSION_UNIQUE_NAME@
 #define	__log_cursor __log_cursor@DB_VERSION_UNIQUE_NAME@
-#define	__log_c_close __log_c_close@DB_VERSION_UNIQUE_NAME@
-#define	__log_c_version __log_c_version@DB_VERSION_UNIQUE_NAME@
-#define	__log_c_get __log_c_get@DB_VERSION_UNIQUE_NAME@
+#define	__logc_close __logc_close@DB_VERSION_UNIQUE_NAME@
+#define	__logc_version __logc_version@DB_VERSION_UNIQUE_NAME@
+#define	__logc_get __logc_get@DB_VERSION_UNIQUE_NAME@
 #define	__log_rep_split __log_rep_split@DB_VERSION_UNIQUE_NAME@
-#define	__log_dbenv_create __log_dbenv_create@DB_VERSION_UNIQUE_NAME@
-#define	__log_dbenv_destroy __log_dbenv_destroy@DB_VERSION_UNIQUE_NAME@
+#define	__log_env_create __log_env_create@DB_VERSION_UNIQUE_NAME@
+#define	__log_env_destroy __log_env_destroy@DB_VERSION_UNIQUE_NAME@
 #define	__log_get_lg_bsize __log_get_lg_bsize@DB_VERSION_UNIQUE_NAME@
 #define	__log_set_lg_bsize __log_set_lg_bsize@DB_VERSION_UNIQUE_NAME@
 #define	__log_get_lg_filemode __log_get_lg_filemode@DB_VERSION_UNIQUE_NAME@
@@ -973,7 +1030,7 @@
 #define	__memp_set_ftype __memp_set_ftype@DB_VERSION_UNIQUE_NAME@
 #define	__memp_set_lsn_offset __memp_set_lsn_offset@DB_VERSION_UNIQUE_NAME@
 #define	__memp_set_pgcookie __memp_set_pgcookie@DB_VERSION_UNIQUE_NAME@
-#define	__memp_last_pgno __memp_last_pgno@DB_VERSION_UNIQUE_NAME@
+#define	__memp_get_last_pgno __memp_get_last_pgno@DB_VERSION_UNIQUE_NAME@
 #define	__memp_fn __memp_fn@DB_VERSION_UNIQUE_NAME@
 #define	__memp_fns __memp_fns@DB_VERSION_UNIQUE_NAME@
 #define	__memp_fopen_pp __memp_fopen_pp@DB_VERSION_UNIQUE_NAME@
@@ -984,13 +1041,13 @@
 #define	__memp_inmemlist __memp_inmemlist@DB_VERSION_UNIQUE_NAME@
 #define	__memp_fput_pp __memp_fput_pp@DB_VERSION_UNIQUE_NAME@
 #define	__memp_fput __memp_fput@DB_VERSION_UNIQUE_NAME@
-#define	__memp_fset_pp __memp_fset_pp@DB_VERSION_UNIQUE_NAME@
-#define	__memp_fset __memp_fset@DB_VERSION_UNIQUE_NAME@
 #define	__memp_dirty __memp_dirty@DB_VERSION_UNIQUE_NAME@
-#define	__memp_dbenv_create __memp_dbenv_create@DB_VERSION_UNIQUE_NAME@
-#define	__memp_dbenv_destroy __memp_dbenv_destroy@DB_VERSION_UNIQUE_NAME@
+#define	__memp_env_create __memp_env_create@DB_VERSION_UNIQUE_NAME@
+#define	__memp_env_destroy __memp_env_destroy@DB_VERSION_UNIQUE_NAME@
 #define	__memp_get_cachesize __memp_get_cachesize@DB_VERSION_UNIQUE_NAME@
 #define	__memp_set_cachesize __memp_set_cachesize@DB_VERSION_UNIQUE_NAME@
+#define	__memp_set_config __memp_set_config@DB_VERSION_UNIQUE_NAME@
+#define	__memp_get_config __memp_get_config@DB_VERSION_UNIQUE_NAME@
 #define	__memp_get_mp_max_openfd __memp_get_mp_max_openfd@DB_VERSION_UNIQUE_NAME@
 #define	__memp_set_mp_max_openfd __memp_set_mp_max_openfd@DB_VERSION_UNIQUE_NAME@
 #define	__memp_get_mp_max_write __memp_get_mp_max_write@DB_VERSION_UNIQUE_NAME@
@@ -1010,10 +1067,16 @@
 #define	__memp_bh_freeze __memp_bh_freeze@DB_VERSION_UNIQUE_NAME@
 #define	__memp_bh_thaw __memp_bh_thaw@DB_VERSION_UNIQUE_NAME@
 #define	__memp_open __memp_open@DB_VERSION_UNIQUE_NAME@
+#define	__memp_init __memp_init@DB_VERSION_UNIQUE_NAME@
+#define	__memp_max_regions __memp_max_regions@DB_VERSION_UNIQUE_NAME@
 #define	__memp_region_mutex_count __memp_region_mutex_count@DB_VERSION_UNIQUE_NAME@
-#define	__memp_dbenv_refresh __memp_dbenv_refresh@DB_VERSION_UNIQUE_NAME@
+#define	__memp_env_refresh __memp_env_refresh@DB_VERSION_UNIQUE_NAME@
 #define	__memp_register_pp __memp_register_pp@DB_VERSION_UNIQUE_NAME@
 #define	__memp_register __memp_register@DB_VERSION_UNIQUE_NAME@
+#define	__memp_get_bucket __memp_get_bucket@DB_VERSION_UNIQUE_NAME@
+#define	__memp_resize __memp_resize@DB_VERSION_UNIQUE_NAME@
+#define	__memp_get_cache_max __memp_get_cache_max@DB_VERSION_UNIQUE_NAME@
+#define	__memp_set_cache_max __memp_set_cache_max@DB_VERSION_UNIQUE_NAME@
 #define	__memp_stat_pp __memp_stat_pp@DB_VERSION_UNIQUE_NAME@
 #define	__memp_stat_print_pp __memp_stat_print_pp@DB_VERSION_UNIQUE_NAME@
 #define	__memp_stat_print __memp_stat_print@DB_VERSION_UNIQUE_NAME@
@@ -1053,9 +1116,10 @@
 #define	__db_pthread_mutex_unlock __db_pthread_mutex_unlock@DB_VERSION_UNIQUE_NAME@
 #define	__db_pthread_mutex_destroy __db_pthread_mutex_destroy@DB_VERSION_UNIQUE_NAME@
 #define	__mutex_open __mutex_open@DB_VERSION_UNIQUE_NAME@
-#define	__mutex_dbenv_refresh __mutex_dbenv_refresh@DB_VERSION_UNIQUE_NAME@
+#define	__mutex_env_refresh __mutex_env_refresh@DB_VERSION_UNIQUE_NAME@
 #define	__mutex_resource_return __mutex_resource_return@DB_VERSION_UNIQUE_NAME@
-#define	__mutex_stat __mutex_stat@DB_VERSION_UNIQUE_NAME@
+#define	__mutex_stat_pp __mutex_stat_pp@DB_VERSION_UNIQUE_NAME@
+#define	__mutex_stat_print_pp __mutex_stat_print_pp@DB_VERSION_UNIQUE_NAME@
 #define	__mutex_stat_print __mutex_stat_print@DB_VERSION_UNIQUE_NAME@
 #define	__mutex_print_debug_single __mutex_print_debug_single@DB_VERSION_UNIQUE_NAME@
 #define	__mutex_print_debug_stats __mutex_print_debug_stats@DB_VERSION_UNIQUE_NAME@
@@ -1069,6 +1133,7 @@
 #define	__db_win32_mutex_lock __db_win32_mutex_lock@DB_VERSION_UNIQUE_NAME@
 #define	__db_win32_mutex_unlock __db_win32_mutex_unlock@DB_VERSION_UNIQUE_NAME@
 #define	__db_win32_mutex_destroy __db_win32_mutex_destroy@DB_VERSION_UNIQUE_NAME@
+#define	__os_abort __os_abort@DB_VERSION_UNIQUE_NAME@
 #define	__os_abspath __os_abspath@DB_VERSION_UNIQUE_NAME@
 #define	__os_umalloc __os_umalloc@DB_VERSION_UNIQUE_NAME@
 #define	__os_urealloc __os_urealloc@DB_VERSION_UNIQUE_NAME@
@@ -1079,7 +1144,7 @@
 #define	__os_realloc __os_realloc@DB_VERSION_UNIQUE_NAME@
 #define	__os_free __os_free@DB_VERSION_UNIQUE_NAME@
 #define	__ua_memcpy __ua_memcpy@DB_VERSION_UNIQUE_NAME@
-#define	__os_clock __os_clock@DB_VERSION_UNIQUE_NAME@
+#define	__os_gettime __os_gettime@DB_VERSION_UNIQUE_NAME@
 #define	__os_fs_notzero __os_fs_notzero@DB_VERSION_UNIQUE_NAME@
 #define	__os_support_direct_io __os_support_direct_io@DB_VERSION_UNIQUE_NAME@
 #define	__os_support_db_register __os_support_db_register@DB_VERSION_UNIQUE_NAME@
@@ -1108,10 +1173,6 @@
 #define	__db_oflags __db_oflags@DB_VERSION_UNIQUE_NAME@
 #define	__db_omode __db_omode@DB_VERSION_UNIQUE_NAME@
 #define	__os_open __os_open@DB_VERSION_UNIQUE_NAME@
-#define	__os_open_extend __os_open_extend@DB_VERSION_UNIQUE_NAME@
-#ifdef HAVE_QNX
-#define	__os_shmname __os_shmname@DB_VERSION_UNIQUE_NAME@
-#endif
 #define	__os_id __os_id@DB_VERSION_UNIQUE_NAME@
 #define	__os_r_attach __os_r_attach@DB_VERSION_UNIQUE_NAME@
 #define	__os_r_detach __os_r_detach@DB_VERSION_UNIQUE_NAME@
@@ -1133,13 +1194,46 @@
 #define	__os_region_unlink __os_region_unlink@DB_VERSION_UNIQUE_NAME@
 #define	__os_unlink __os_unlink@DB_VERSION_UNIQUE_NAME@
 #define	__os_yield __os_yield@DB_VERSION_UNIQUE_NAME@
+#ifndef HAVE_FCLOSE
+#define	fclose fclose@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_FGETC
+#define	fgetc fgetc@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_FGETS
+#define	fgets fgets@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_FOPEN
+#define	fopen fopen@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_FWRITE
+#define	fwrite fwrite@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_LOCALTIME
+#define	localtime localtime@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_TIME
+#define	time time@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifdef HAVE_QNX
+#define	__os_qnx_region_open __os_qnx_region_open@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifdef HAVE_QNX
+#define	__os_qnx_shmname __os_qnx_shmname@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_TIME
+#define	time time@DB_VERSION_UNIQUE_NAME@
+#endif
 #define	__os_is_winnt __os_is_winnt@DB_VERSION_UNIQUE_NAME@
+#ifdef HAVE_REPLICATION_THREADS
 #define	__os_get_neterr __os_get_neterr@DB_VERSION_UNIQUE_NAME@
+#endif
+#define	__os_mkdir __os_mkdir@DB_VERSION_UNIQUE_NAME@
 #define	__qam_position __qam_position@DB_VERSION_UNIQUE_NAME@
 #define	__qam_pitem __qam_pitem@DB_VERSION_UNIQUE_NAME@
 #define	__qam_append __qam_append@DB_VERSION_UNIQUE_NAME@
-#define	__qam_c_dup __qam_c_dup@DB_VERSION_UNIQUE_NAME@
-#define	__qam_c_init __qam_c_init@DB_VERSION_UNIQUE_NAME@
+#define	__qamc_dup __qamc_dup@DB_VERSION_UNIQUE_NAME@
+#define	__qamc_init __qamc_init@DB_VERSION_UNIQUE_NAME@
 #define	__qam_truncate __qam_truncate@DB_VERSION_UNIQUE_NAME@
 #define	__qam_delete __qam_delete@DB_VERSION_UNIQUE_NAME@
 #define	__qam_incfirst_log __qam_incfirst_log@DB_VERSION_UNIQUE_NAME@
@@ -1210,18 +1304,27 @@
 #define	__rep_init_cleanup __rep_init_cleanup@DB_VERSION_UNIQUE_NAME@
 #define	__rep_pggap_req __rep_pggap_req@DB_VERSION_UNIQUE_NAME@
 #define	__rep_finfo_alloc __rep_finfo_alloc@DB_VERSION_UNIQUE_NAME@
+#define	__rep_remove_init_file __rep_remove_init_file@DB_VERSION_UNIQUE_NAME@
+#define	__rep_reset_init __rep_reset_init@DB_VERSION_UNIQUE_NAME@
 #define	__rep_elect __rep_elect@DB_VERSION_UNIQUE_NAME@
 #define	__rep_vote1 __rep_vote1@DB_VERSION_UNIQUE_NAME@
 #define	__rep_vote2 __rep_vote2@DB_VERSION_UNIQUE_NAME@
-#define	__rep_elect_master __rep_elect_master@DB_VERSION_UNIQUE_NAME@
+#define	__rep_update_grant __rep_update_grant@DB_VERSION_UNIQUE_NAME@
+#define	__rep_islease_granted __rep_islease_granted@DB_VERSION_UNIQUE_NAME@
+#define	__rep_lease_table_alloc __rep_lease_table_alloc@DB_VERSION_UNIQUE_NAME@
+#define	__rep_lease_grant __rep_lease_grant@DB_VERSION_UNIQUE_NAME@
+#define	__rep_lease_check __rep_lease_check@DB_VERSION_UNIQUE_NAME@
+#define	__rep_lease_refresh __rep_lease_refresh@DB_VERSION_UNIQUE_NAME@
+#define	__rep_lease_expire __rep_lease_expire@DB_VERSION_UNIQUE_NAME@
+#define	__rep_lease_waittime __rep_lease_waittime@DB_VERSION_UNIQUE_NAME@
 #define	__rep_allreq __rep_allreq@DB_VERSION_UNIQUE_NAME@
 #define	__rep_log __rep_log@DB_VERSION_UNIQUE_NAME@
 #define	__rep_bulk_log __rep_bulk_log@DB_VERSION_UNIQUE_NAME@
 #define	__rep_logreq __rep_logreq@DB_VERSION_UNIQUE_NAME@
 #define	__rep_loggap_req __rep_loggap_req@DB_VERSION_UNIQUE_NAME@
 #define	__rep_logready __rep_logready@DB_VERSION_UNIQUE_NAME@
-#define	__rep_dbenv_create __rep_dbenv_create@DB_VERSION_UNIQUE_NAME@
-#define	__rep_dbenv_destroy __rep_dbenv_destroy@DB_VERSION_UNIQUE_NAME@
+#define	__rep_env_create __rep_env_create@DB_VERSION_UNIQUE_NAME@
+#define	__rep_env_destroy __rep_env_destroy@DB_VERSION_UNIQUE_NAME@
 #define	__rep_get_config __rep_get_config@DB_VERSION_UNIQUE_NAME@
 #define	__rep_set_config __rep_set_config@DB_VERSION_UNIQUE_NAME@
 #define	__rep_start __rep_start@DB_VERSION_UNIQUE_NAME@
@@ -1237,19 +1340,21 @@
 #define	__rep_get_request __rep_get_request@DB_VERSION_UNIQUE_NAME@
 #define	__rep_set_request __rep_set_request@DB_VERSION_UNIQUE_NAME@
 #define	__rep_set_transport __rep_set_transport@DB_VERSION_UNIQUE_NAME@
+#define	__rep_set_lease __rep_set_lease@DB_VERSION_UNIQUE_NAME@
 #define	__rep_flush __rep_flush@DB_VERSION_UNIQUE_NAME@
 #define	__rep_sync __rep_sync@DB_VERSION_UNIQUE_NAME@
 #define	__rep_process_message __rep_process_message@DB_VERSION_UNIQUE_NAME@
 #define	__rep_apply __rep_apply@DB_VERSION_UNIQUE_NAME@
 #define	__rep_process_txn __rep_process_txn@DB_VERSION_UNIQUE_NAME@
+#define	__rep_resend_req __rep_resend_req@DB_VERSION_UNIQUE_NAME@
 #define	__rep_check_doreq __rep_check_doreq@DB_VERSION_UNIQUE_NAME@
 #define	__rep_open __rep_open@DB_VERSION_UNIQUE_NAME@
-#define	__rep_region_destroy __rep_region_destroy@DB_VERSION_UNIQUE_NAME@
-#define	__rep_dbenv_refresh __rep_dbenv_refresh@DB_VERSION_UNIQUE_NAME@
-#define	__rep_close __rep_close@DB_VERSION_UNIQUE_NAME@
+#define	__rep_env_refresh __rep_env_refresh@DB_VERSION_UNIQUE_NAME@
+#define	__rep_env_close __rep_env_close@DB_VERSION_UNIQUE_NAME@
 #define	__rep_preclose __rep_preclose@DB_VERSION_UNIQUE_NAME@
 #define	__rep_closefiles __rep_closefiles@DB_VERSION_UNIQUE_NAME@
 #define	__rep_write_egen __rep_write_egen@DB_VERSION_UNIQUE_NAME@
+#define	__rep_write_gen __rep_write_gen@DB_VERSION_UNIQUE_NAME@
 #define	__rep_stat_pp __rep_stat_pp@DB_VERSION_UNIQUE_NAME@
 #define	__rep_stat_print_pp __rep_stat_print_pp@DB_VERSION_UNIQUE_NAME@
 #define	__rep_stat_print __rep_stat_print@DB_VERSION_UNIQUE_NAME@
@@ -1268,13 +1373,15 @@
 #define	__db_rep_enter __db_rep_enter@DB_VERSION_UNIQUE_NAME@
 #define	__op_rep_enter __op_rep_enter@DB_VERSION_UNIQUE_NAME@
 #define	__op_rep_exit __op_rep_exit@DB_VERSION_UNIQUE_NAME@
-#define	__rep_get_gen __rep_get_gen@DB_VERSION_UNIQUE_NAME@
 #define	__rep_lockout_api __rep_lockout_api@DB_VERSION_UNIQUE_NAME@
+#define	__rep_lockout_apply __rep_lockout_apply@DB_VERSION_UNIQUE_NAME@
 #define	__rep_lockout_msg __rep_lockout_msg@DB_VERSION_UNIQUE_NAME@
 #define	__rep_send_throttle __rep_send_throttle@DB_VERSION_UNIQUE_NAME@
 #define	__rep_msg_to_old __rep_msg_to_old@DB_VERSION_UNIQUE_NAME@
 #define	__rep_msg_from_old __rep_msg_from_old@DB_VERSION_UNIQUE_NAME@
+#define	__rep_print __rep_print@DB_VERSION_UNIQUE_NAME@
 #define	__rep_print_message __rep_print_message@DB_VERSION_UNIQUE_NAME@
+#define	__rep_fire_event __rep_fire_event@DB_VERSION_UNIQUE_NAME@
 #define	__rep_verify __rep_verify@DB_VERSION_UNIQUE_NAME@
 #define	__rep_verify_fail __rep_verify_fail@DB_VERSION_UNIQUE_NAME@
 #define	__rep_verify_req __rep_verify_req@DB_VERSION_UNIQUE_NAME@
@@ -1286,12 +1393,13 @@
 #define	__repmgr_close __repmgr_close@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_set_ack_policy __repmgr_set_ack_policy@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_get_ack_policy __repmgr_get_ack_policy@DB_VERSION_UNIQUE_NAME@
-#define	__repmgr_dbenv_create __repmgr_dbenv_create@DB_VERSION_UNIQUE_NAME@
-#define	__repmgr_dbenv_destroy __repmgr_dbenv_destroy@DB_VERSION_UNIQUE_NAME@
+#define	__repmgr_env_create __repmgr_env_create@DB_VERSION_UNIQUE_NAME@
+#define	__repmgr_env_destroy __repmgr_env_destroy@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_stop_threads __repmgr_stop_threads@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_set_local_site __repmgr_set_local_site@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_add_remote_site __repmgr_add_remote_site@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_msg_thread __repmgr_msg_thread@DB_VERSION_UNIQUE_NAME@
+#define	__repmgr_handle_event __repmgr_handle_event@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_stash_generation __repmgr_stash_generation@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_send __repmgr_send@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_send_one __repmgr_send_one@DB_VERSION_UNIQUE_NAME@
@@ -1321,7 +1429,6 @@
 #define	__repmgr_wake_main_thread __repmgr_wake_main_thread@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_writev __repmgr_writev@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_readv __repmgr_readv@DB_VERSION_UNIQUE_NAME@
-#define	__repmgr_timeval_diff_current __repmgr_timeval_diff_current@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_select_loop __repmgr_select_loop@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_queue_create __repmgr_queue_create@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_queue_destroy __repmgr_queue_destroy@DB_VERSION_UNIQUE_NAME@
@@ -1336,8 +1443,39 @@
 #define	__repmgr_send_handshake __repmgr_send_handshake@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_read_from_site __repmgr_read_from_site@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_write_some __repmgr_write_some@DB_VERSION_UNIQUE_NAME@
+#define	__repmgr_stat_pp __repmgr_stat_pp@DB_VERSION_UNIQUE_NAME@
+#define	__repmgr_stat_print_pp __repmgr_stat_print_pp@DB_VERSION_UNIQUE_NAME@
+#define	__repmgr_site_list __repmgr_site_list@DB_VERSION_UNIQUE_NAME@
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_close __repmgr_close@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_add_remote_site __repmgr_add_remote_site@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_get_ack_policy __repmgr_get_ack_policy@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_set_ack_policy __repmgr_set_ack_policy@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_set_local_site __repmgr_set_local_site@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
 #define	__repmgr_site_list __repmgr_site_list@DB_VERSION_UNIQUE_NAME@
-#define	__repmgr_print_stats __repmgr_print_stats@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_start __repmgr_start@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_stat_pp __repmgr_stat_pp@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_stat_print_pp __repmgr_stat_print_pp@DB_VERSION_UNIQUE_NAME@
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+#define	__repmgr_handle_event __repmgr_handle_event@DB_VERSION_UNIQUE_NAME@
+#endif
 #define	__repmgr_schedule_connection_attempt __repmgr_schedule_connection_attempt@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_reset_for_reading __repmgr_reset_for_reading@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_new_connection __repmgr_new_connection@DB_VERSION_UNIQUE_NAME@
@@ -1348,11 +1486,12 @@
 #define	__repmgr_add_dbt __repmgr_add_dbt@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_update_consumed __repmgr_update_consumed@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_prepare_my_addr __repmgr_prepare_my_addr@DB_VERSION_UNIQUE_NAME@
-#define	__repmgr_timeval_cmp __repmgr_timeval_cmp@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_get_nsites __repmgr_get_nsites@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_thread_failure __repmgr_thread_failure@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_format_eid_loc __repmgr_format_eid_loc@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_format_site_loc __repmgr_format_site_loc@DB_VERSION_UNIQUE_NAME@
+#define	__repmgr_timespec_diff_now __repmgr_timespec_diff_now@DB_VERSION_UNIQUE_NAME@
+#define	__repmgr_repstart __repmgr_repstart@DB_VERSION_UNIQUE_NAME@
 #define	__repmgr_wsa_init __repmgr_wsa_init@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_env_set_rpc_server __dbcl_env_set_rpc_server@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_env_close_wrap __dbcl_env_close_wrap@DB_VERSION_UNIQUE_NAME@
@@ -1398,6 +1537,7 @@
 #define	__dbcl_db_get_lorder __dbcl_db_get_lorder@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_get_open_flags __dbcl_db_get_open_flags@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_get_pagesize __dbcl_db_get_pagesize@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_db_get_priority __dbcl_db_get_priority@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_get_q_extentsize __dbcl_db_get_q_extentsize@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_get_re_delim __dbcl_db_get_re_delim@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_get_re_len __dbcl_db_get_re_len@DB_VERSION_UNIQUE_NAME@
@@ -1416,6 +1556,7 @@
 #define	__dbcl_db_set_h_nelem __dbcl_db_set_h_nelem@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_set_lorder __dbcl_db_set_lorder@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_set_pagesize __dbcl_db_set_pagesize@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_db_set_priority __dbcl_db_set_priority@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_set_q_extentsize __dbcl_db_set_q_extentsize@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_set_re_delim __dbcl_db_set_re_delim@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_set_re_len __dbcl_db_set_re_len@DB_VERSION_UNIQUE_NAME@
@@ -1423,13 +1564,15 @@
 #define	__dbcl_db_stat __dbcl_db_stat@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_sync __dbcl_db_sync@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_truncate __dbcl_db_truncate@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_close __dbcl_dbc_c_close@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_count __dbcl_dbc_c_count@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_del __dbcl_dbc_c_del@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_dup __dbcl_dbc_c_dup@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_get __dbcl_dbc_c_get@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_pget __dbcl_dbc_c_pget@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_put __dbcl_dbc_c_put@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_close __dbcl_dbc_close@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_count __dbcl_dbc_count@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_del __dbcl_dbc_del@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_dup __dbcl_dbc_dup@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_get __dbcl_dbc_get@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_get_priority __dbcl_dbc_get_priority@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_pget __dbcl_dbc_pget@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_put __dbcl_dbc_put@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_set_priority __dbcl_dbc_set_priority@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_txn_abort __dbcl_txn_abort@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_txn_commit __dbcl_txn_commit@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_txn_discard __dbcl_txn_discard@DB_VERSION_UNIQUE_NAME@
@@ -1460,12 +1603,12 @@
 #define	__dbcl_db_truncate_ret __dbcl_db_truncate_ret@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_cursor_ret __dbcl_db_cursor_ret@DB_VERSION_UNIQUE_NAME@
 #define	__dbcl_db_join_ret __dbcl_db_join_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_close_ret __dbcl_dbc_c_close_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_count_ret __dbcl_dbc_c_count_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_dup_ret __dbcl_dbc_c_dup_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_get_ret __dbcl_dbc_c_get_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_pget_ret __dbcl_dbc_c_pget_ret@DB_VERSION_UNIQUE_NAME@
-#define	__dbcl_dbc_c_put_ret __dbcl_dbc_c_put_ret@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_close_ret __dbcl_dbc_close_ret@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_count_ret __dbcl_dbc_count_ret@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_dup_ret __dbcl_dbc_dup_ret@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_get_ret __dbcl_dbc_get_ret@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_pget_ret __dbcl_dbc_pget_ret@DB_VERSION_UNIQUE_NAME@
+#define	__dbcl_dbc_put_ret __dbcl_dbc_put_ret@DB_VERSION_UNIQUE_NAME@
 #define	__env_get_cachesize_proc __env_get_cachesize_proc@DB_VERSION_UNIQUE_NAME@
 #define	__env_set_cachesize_proc __env_set_cachesize_proc@DB_VERSION_UNIQUE_NAME@
 #define	__env_cdsgroup_begin_proc __env_cdsgroup_begin_proc@DB_VERSION_UNIQUE_NAME@
@@ -1514,6 +1657,8 @@
 #define	__db_set_pagesize_proc __db_set_pagesize_proc@DB_VERSION_UNIQUE_NAME@
 #define	__db_pget_proc __db_pget_proc@DB_VERSION_UNIQUE_NAME@
 #define	__db_put_proc __db_put_proc@DB_VERSION_UNIQUE_NAME@
+#define	__db_get_priority_proc __db_get_priority_proc@DB_VERSION_UNIQUE_NAME@
+#define	__db_set_priority_proc __db_set_priority_proc@DB_VERSION_UNIQUE_NAME@
 #define	__db_get_re_delim_proc __db_get_re_delim_proc@DB_VERSION_UNIQUE_NAME@
 #define	__db_set_re_delim_proc __db_set_re_delim_proc@DB_VERSION_UNIQUE_NAME@
 #define	__db_get_re_len_proc __db_get_re_len_proc@DB_VERSION_UNIQUE_NAME@
@@ -1527,13 +1672,15 @@
 #define	__db_truncate_proc __db_truncate_proc@DB_VERSION_UNIQUE_NAME@
 #define	__db_cursor_proc __db_cursor_proc@DB_VERSION_UNIQUE_NAME@
 #define	__db_join_proc __db_join_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_c_close_proc __dbc_c_close_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_c_count_proc __dbc_c_count_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_c_del_proc __dbc_c_del_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_c_dup_proc __dbc_c_dup_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_c_get_proc __dbc_c_get_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_c_pget_proc __dbc_c_pget_proc@DB_VERSION_UNIQUE_NAME@
-#define	__dbc_c_put_proc __dbc_c_put_proc@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_close_proc __dbc_close_proc@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_count_proc __dbc_count_proc@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_del_proc __dbc_del_proc@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_dup_proc __dbc_dup_proc@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_get_proc __dbc_get_proc@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_pget_proc __dbc_pget_proc@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_put_proc __dbc_put_proc@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_get_priority_proc __dbc_get_priority_proc@DB_VERSION_UNIQUE_NAME@
+#define	__dbc_set_priority_proc __dbc_set_priority_proc@DB_VERSION_UNIQUE_NAME@
 #define	__dbsrv_settimeout __dbsrv_settimeout@DB_VERSION_UNIQUE_NAME@
 #define	__dbclear_ctp __dbclear_ctp@DB_VERSION_UNIQUE_NAME@
 #define	__dbdel_ctp __dbdel_ctp@DB_VERSION_UNIQUE_NAME@
@@ -1620,13 +1767,16 @@
 #define	tcl_RepElect tcl_RepElect@DB_VERSION_UNIQUE_NAME@
 #define	tcl_RepFlush tcl_RepFlush@DB_VERSION_UNIQUE_NAME@
 #define	tcl_RepSync tcl_RepSync@DB_VERSION_UNIQUE_NAME@
+#define	tcl_RepLease tcl_RepLease@DB_VERSION_UNIQUE_NAME@
 #define	tcl_RepLimit tcl_RepLimit@DB_VERSION_UNIQUE_NAME@
 #define	tcl_RepRequest tcl_RepRequest@DB_VERSION_UNIQUE_NAME@
+#define	tcl_RepNoarchiveTimeout tcl_RepNoarchiveTimeout@DB_VERSION_UNIQUE_NAME@
 #define	tcl_RepTransport tcl_RepTransport@DB_VERSION_UNIQUE_NAME@
 #define	tcl_RepStart tcl_RepStart@DB_VERSION_UNIQUE_NAME@
 #define	tcl_RepProcessMessage tcl_RepProcessMessage@DB_VERSION_UNIQUE_NAME@
 #define	tcl_RepStat tcl_RepStat@DB_VERSION_UNIQUE_NAME@
 #define	tcl_RepMgr tcl_RepMgr@DB_VERSION_UNIQUE_NAME@
+#define	tcl_RepMgrStat tcl_RepMgrStat@DB_VERSION_UNIQUE_NAME@
 #define	seq_Cmd seq_Cmd@DB_VERSION_UNIQUE_NAME@
 #define	_TxnInfoDelete _TxnInfoDelete@DB_VERSION_UNIQUE_NAME@
 #define	tcl_TxnCheckpoint tcl_TxnCheckpoint@DB_VERSION_UNIQUE_NAME@
@@ -1681,8 +1831,8 @@
 #define	__txn_getckp __txn_getckp@DB_VERSION_UNIQUE_NAME@
 #define	__txn_updateckp __txn_updateckp@DB_VERSION_UNIQUE_NAME@
 #define	__txn_failchk __txn_failchk@DB_VERSION_UNIQUE_NAME@
-#define	__txn_dbenv_create __txn_dbenv_create@DB_VERSION_UNIQUE_NAME@
-#define	__txn_dbenv_destroy __txn_dbenv_destroy@DB_VERSION_UNIQUE_NAME@
+#define	__txn_env_create __txn_env_create@DB_VERSION_UNIQUE_NAME@
+#define	__txn_env_destroy __txn_env_destroy@DB_VERSION_UNIQUE_NAME@
 #define	__txn_get_tx_max __txn_get_tx_max@DB_VERSION_UNIQUE_NAME@
 #define	__txn_set_tx_max __txn_set_tx_max@DB_VERSION_UNIQUE_NAME@
 #define	__txn_get_tx_timestamp __txn_get_tx_timestamp@DB_VERSION_UNIQUE_NAME@
@@ -1702,7 +1852,8 @@
 #define	__txn_openfiles __txn_openfiles@DB_VERSION_UNIQUE_NAME@
 #define	__txn_open __txn_open@DB_VERSION_UNIQUE_NAME@
 #define	__txn_findlastckp __txn_findlastckp@DB_VERSION_UNIQUE_NAME@
-#define	__txn_dbenv_refresh __txn_dbenv_refresh@DB_VERSION_UNIQUE_NAME@
+#define	__txn_env_refresh __txn_env_refresh@DB_VERSION_UNIQUE_NAME@
+#define	__txn_region_mutex_count __txn_region_mutex_count@DB_VERSION_UNIQUE_NAME@
 #define	__txn_id_set __txn_id_set@DB_VERSION_UNIQUE_NAME@
 #define	__txn_oldest_reader __txn_oldest_reader@DB_VERSION_UNIQUE_NAME@
 #define	__txn_add_buffer __txn_add_buffer@DB_VERSION_UNIQUE_NAME@
@@ -1716,6 +1867,8 @@
 #define	__txn_lockevent __txn_lockevent@DB_VERSION_UNIQUE_NAME@
 #define	__txn_remlock __txn_remlock@DB_VERSION_UNIQUE_NAME@
 #define	__txn_doevents __txn_doevents@DB_VERSION_UNIQUE_NAME@
+#define	__txn_record_fname __txn_record_fname@DB_VERSION_UNIQUE_NAME@
+#define	__txn_dref_fname __txn_dref_fname@DB_VERSION_UNIQUE_NAME@
 #define	__xa_get_txn __xa_get_txn@DB_VERSION_UNIQUE_NAME@
 #define	__db_xa_create __db_xa_create@DB_VERSION_UNIQUE_NAME@
 #define	__db_rmid_to_env __db_rmid_to_env@DB_VERSION_UNIQUE_NAME@
diff --git a/db/dbinc_auto/lock_ext.h b/db/dbinc_auto/lock_ext.h
index f84f27483..3a067bc4b 100644
--- a/db/dbinc_auto/lock_ext.h
+++ b/db/dbinc_auto/lock_ext.h
@@ -7,33 +7,34 @@ extern "C" {
 #endif
 
 int __lock_vec_pp __P((DB_ENV *, u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
-int __lock_vec __P((DB_ENV *, u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
+int __lock_vec __P((DB_ENV *, DB_LOCKER *, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
 int __lock_get_pp __P((DB_ENV *, u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
-int __lock_get __P((DB_ENV *, u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
-int  __lock_get_internal __P((DB_LOCKTAB *, u_int32_t, u_int32_t, const DBT *, db_lockmode_t, db_timeout_t, DB_LOCK *));
+int __lock_get __P((DB_ENV *, DB_LOCKER *, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
+int  __lock_get_internal __P((DB_LOCKTAB *, DB_LOCKER *, u_int32_t, const DBT *, db_lockmode_t, db_timeout_t, DB_LOCK *));
 int  __lock_put_pp __P((DB_ENV *, DB_LOCK *));
 int  __lock_put __P((DB_ENV *, DB_LOCK *));
 int __lock_downgrade __P((DB_ENV *, DB_LOCK *, db_lockmode_t, u_int32_t));
-int __lock_locker_is_parent __P((DB_ENV *, u_int32_t, u_int32_t, int *));
+int __lock_locker_is_parent __P((DB_ENV *, DB_LOCKER *, DB_LOCKER *, int *));
 int __lock_promote __P((DB_LOCKTAB *, DB_LOCKOBJ *, int *, u_int32_t));
 int __lock_detect_pp __P((DB_ENV *, u_int32_t, u_int32_t, int *));
 int __lock_detect __P((DB_ENV *, u_int32_t, int *));
 int __lock_failchk __P((DB_ENV *));
 int __lock_id_pp __P((DB_ENV *, u_int32_t *));
 int  __lock_id __P((DB_ENV *, u_int32_t *, DB_LOCKER **));
-void __lock_set_thread_id __P((DB_LOCKER *, pid_t, db_threadid_t));
+void __lock_set_thread_id __P((void *, pid_t, db_threadid_t));
 int __lock_id_free_pp __P((DB_ENV *, u_int32_t));
-int  __lock_id_free __P((DB_ENV *, u_int32_t));
+int  __lock_id_free __P((DB_ENV *, DB_LOCKER *));
 int __lock_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
-int __lock_getlocker __P((DB_LOCKTAB *, u_int32_t, u_int32_t, int, DB_LOCKER **));
+int __lock_getlocker __P((DB_LOCKTAB *, u_int32_t, int, DB_LOCKER **));
+int __lock_getlocker_int __P((DB_LOCKTAB *, u_int32_t, int, DB_LOCKER **));
 int __lock_addfamilylocker __P((DB_ENV *, u_int32_t, u_int32_t));
-int __lock_freefamilylocker  __P((DB_LOCKTAB *, u_int32_t));
-void __lock_freelocker __P((DB_LOCKTAB *, DB_LOCKREGION *, DB_LOCKER *, u_int32_t));
+int __lock_freefamilylocker  __P((DB_LOCKTAB *, DB_LOCKER *));
+int __lock_freelocker __P((DB_LOCKTAB *, DB_LOCKREGION *, DB_LOCKER *));
 int __lock_fix_list __P((DB_ENV *, DBT *, u_int32_t));
-int __lock_get_list __P((DB_ENV *, u_int32_t, u_int32_t, db_lockmode_t, DBT *));
+int __lock_get_list __P((DB_ENV *, DB_LOCKER *, u_int32_t, db_lockmode_t, DBT *));
 void __lock_list_print __P((DB_ENV *, DBT *));
-int __lock_dbenv_create __P((DB_ENV *));
-void __lock_dbenv_destroy __P((DB_ENV *));
+int __lock_env_create __P((DB_ENV *));
+void __lock_env_destroy __P((DB_ENV *));
 int __lock_get_lk_conflicts __P((DB_ENV *, const u_int8_t **, int *));
 int __lock_set_lk_conflicts __P((DB_ENV *, u_int8_t *, int));
 int __lock_get_lk_detect __P((DB_ENV *, u_int32_t *));
@@ -46,18 +47,18 @@ int __lock_get_lk_max_objects __P((DB_ENV *, u_int32_t *));
 int __lock_set_lk_max_objects __P((DB_ENV *, u_int32_t));
 int __lock_get_env_timeout __P((DB_ENV *, db_timeout_t *, u_int32_t));
 int __lock_set_env_timeout __P((DB_ENV *, db_timeout_t, u_int32_t));
-int __lock_open __P((DB_ENV *));
-int __lock_dbenv_refresh __P((DB_ENV *));
+int __lock_open __P((DB_ENV *, int));
+int __lock_env_refresh __P((DB_ENV *));
 u_int32_t __lock_region_mutex_count __P((DB_ENV *));
 int __lock_stat_pp __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
 int __lock_stat_print_pp __P((DB_ENV *, u_int32_t));
 int  __lock_stat_print __P((DB_ENV *, u_int32_t));
 void __lock_printlock __P((DB_LOCKTAB *, DB_MSGBUF *mbp, struct __db_lock *, int));
-int __lock_set_timeout __P(( DB_ENV *, u_int32_t, db_timeout_t, u_int32_t));
-int __lock_set_timeout_internal __P((DB_ENV *, u_int32_t, db_timeout_t, u_int32_t));
-int __lock_inherit_timeout __P(( DB_ENV *, u_int32_t, u_int32_t));
-void __lock_expires __P((DB_ENV *, db_timeval_t *, db_timeout_t));
-int __lock_expired __P((DB_ENV *, db_timeval_t *, db_timeval_t *));
+int __lock_set_timeout __P((DB_ENV *, DB_LOCKER *, db_timeout_t, u_int32_t));
+int __lock_set_timeout_internal __P((DB_ENV *, DB_LOCKER *, db_timeout_t, u_int32_t));
+int __lock_inherit_timeout __P((DB_ENV *, DB_LOCKER *, DB_LOCKER *));
+void __lock_expires __P((DB_ENV *, db_timespec *, db_timeout_t));
+int __lock_expired __P((DB_ENV *, db_timespec *, db_timespec *));
 u_int32_t __lock_ohash __P((const DBT *));
 u_int32_t __lock_lhash __P((DB_LOCKOBJ *));
 int __lock_nomem __P((DB_ENV *, const char *));
diff --git a/db/dbinc_auto/log_ext.h b/db/dbinc_auto/log_ext.h
index a231bc23e..0170c2c1d 100644
--- a/db/dbinc_auto/log_ext.h
+++ b/db/dbinc_auto/log_ext.h
@@ -6,15 +6,15 @@
 extern "C" {
 #endif
 
-int __log_open __P((DB_ENV *));
+int __log_open __P((DB_ENV *, int));
 int __log_find __P((DB_LOG *, int, u_int32_t *, logfile_validity *));
 int __log_valid __P((DB_LOG *, u_int32_t, int, DB_FH **, u_int32_t, logfile_validity *, u_int32_t *));
-int __log_dbenv_refresh __P((DB_ENV *));
+int __log_env_refresh __P((DB_ENV *));
 int __log_get_cached_ckp_lsn __P((DB_ENV *, DB_LSN *));
 u_int32_t __log_region_mutex_count __P((DB_ENV *));
 int __log_vtruncate __P((DB_ENV *, DB_LSN *, DB_LSN *, DB_LSN *));
 int __log_is_outdated __P((DB_ENV *, u_int32_t, int *));
-int __log_zero __P((DB_ENV *, DB_LSN *, DB_LSN *));
+int __log_zero __P((DB_ENV *, DB_LSN *));
 int __log_inmem_lsnoff __P((DB_LOG *, DB_LSN *, size_t *));
 int __log_inmem_newfile __P((DB_LOG *, u_int32_t));
 int __log_inmem_chkspace __P((DB_LOG *, size_t));
@@ -31,12 +31,12 @@ int __log_printf_pp __P((DB_ENV *, DB_TXN *, const char *, va_list));
 int __log_printf __P((DB_ENV *, DB_TXN *, const char *, ...)) __attribute__ ((__format__ (__printf__, 3, 4)));
 int __log_cursor_pp __P((DB_ENV *, DB_LOGC **, u_int32_t));
 int __log_cursor __P((DB_ENV *, DB_LOGC **));
-int __log_c_close __P((DB_LOGC *));
-int __log_c_version __P((DB_LOGC *, u_int32_t *));
-int __log_c_get __P((DB_LOGC *, DB_LSN *, DBT *, u_int32_t));
+int __logc_close __P((DB_LOGC *));
+int __logc_version __P((DB_LOGC *, u_int32_t *));
+int __logc_get __P((DB_LOGC *, DB_LSN *, DBT *, u_int32_t));
 int __log_rep_split __P((DB_ENV *, REP_CONTROL *, DBT *, DB_LSN *, DB_LSN *));
-int __log_dbenv_create __P((DB_ENV *));
-void __log_dbenv_destroy __P((DB_ENV *));
+int __log_env_create __P((DB_ENV *));
+void __log_env_destroy __P((DB_ENV *));
 int __log_get_lg_bsize __P((DB_ENV *, u_int32_t *));
 int __log_set_lg_bsize __P((DB_ENV *, u_int32_t));
 int __log_get_lg_filemode __P((DB_ENV *, int *));
@@ -59,7 +59,7 @@ int __log_flush __P((DB_ENV *, const DB_LSN *));
 int __log_flush_int __P((DB_LOG *, const DB_LSN *, int));
 int __log_file_pp __P((DB_ENV *, const DB_LSN *, char *, size_t));
 int __log_name __P((DB_LOG *, u_int32_t, char **, DB_FH **, u_int32_t));
-int __log_rep_put __P((DB_ENV *, DB_LSN *, const DBT *));
+int __log_rep_put __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
 int __log_stat_pp __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
 int __log_stat_print_pp __P((DB_ENV *, u_int32_t));
 int __log_stat_print __P((DB_ENV *, u_int32_t));
diff --git a/db/dbinc_auto/mp_ext.h b/db/dbinc_auto/mp_ext.h
index 13e6b1be1..d4974af88 100644
--- a/db/dbinc_auto/mp_ext.h
+++ b/db/dbinc_auto/mp_ext.h
@@ -14,7 +14,7 @@ void __memp_check_order __P((DB_ENV *, DB_MPOOL_HASH *));
 int __memp_bhwrite __P((DB_MPOOL *, DB_MPOOL_HASH *, MPOOLFILE *, BH *, int));
 int __memp_pgread __P((DB_MPOOLFILE *, DB_MPOOL_HASH *, BH *, int));
 int __memp_pg __P((DB_MPOOLFILE *, BH *, int));
-int __memp_bhfree __P((DB_MPOOL *, DB_MPOOL_HASH *, BH *, u_int32_t));
+int __memp_bhfree __P((DB_MPOOL *, REGINFO *, DB_MPOOL_HASH *, BH *, u_int32_t));
 int __memp_fget_pp __P((DB_MPOOLFILE *, db_pgno_t *, DB_TXN *, u_int32_t, void *));
 int __memp_fget __P((DB_MPOOLFILE *, db_pgno_t *, DB_TXN *, u_int32_t, void *));
 int __memp_fcreate_pp __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
@@ -28,7 +28,7 @@ int __memp_get_ftype __P((DB_MPOOLFILE *, int *));
 int __memp_set_ftype __P((DB_MPOOLFILE *, int));
 int __memp_set_lsn_offset __P((DB_MPOOLFILE *, int32_t));
 int __memp_set_pgcookie __P((DB_MPOOLFILE *, DBT *));
-int __memp_last_pgno __P((DB_MPOOLFILE *, db_pgno_t *));
+int __memp_get_last_pgno __P((DB_MPOOLFILE *, db_pgno_t *));
 char * __memp_fn __P((DB_MPOOLFILE *));
 char * __memp_fns __P((DB_MPOOL *, MPOOLFILE *));
 int __memp_fopen_pp __P((DB_MPOOLFILE *, const char *, u_int32_t, int, size_t));
@@ -37,19 +37,19 @@ int __memp_fclose_pp __P((DB_MPOOLFILE *, u_int32_t));
 int __memp_fclose __P((DB_MPOOLFILE *, u_int32_t));
 int __memp_mf_discard __P((DB_MPOOL *, MPOOLFILE *));
 int __memp_inmemlist __P((DB_ENV *, char ***, int *));
-int __memp_fput_pp __P((DB_MPOOLFILE *, void *, u_int32_t));
-int __memp_fput __P((DB_MPOOLFILE *, void *, u_int32_t));
-int __memp_fset_pp __P((DB_MPOOLFILE *, void *, u_int32_t));
-int __memp_fset __P((DB_MPOOLFILE *, void *, u_int32_t));
-int __memp_dirty __P((DB_MPOOLFILE *, void *, DB_TXN *, u_int32_t));
-int __memp_dbenv_create __P((DB_ENV *));
-void __memp_dbenv_destroy __P((DB_ENV *));
+int __memp_fput_pp __P((DB_MPOOLFILE *, void *, DB_CACHE_PRIORITY, u_int32_t));
+int __memp_fput __P((DB_MPOOLFILE *, void *, DB_CACHE_PRIORITY));
+int __memp_dirty __P(( DB_MPOOLFILE *, void *, DB_TXN *, DB_CACHE_PRIORITY, u_int32_t));
+int __memp_env_create __P((DB_ENV *));
+void __memp_env_destroy __P((DB_ENV *));
 int __memp_get_cachesize __P((DB_ENV *, u_int32_t *, u_int32_t *, int *));
 int __memp_set_cachesize __P((DB_ENV *, u_int32_t, u_int32_t, int));
+int __memp_set_config __P((DB_ENV *, u_int32_t, int));
+int __memp_get_config __P((DB_ENV *, u_int32_t, int *));
 int __memp_get_mp_max_openfd __P((DB_ENV *, int *));
 int __memp_set_mp_max_openfd __P((DB_ENV *, int));
-int __memp_get_mp_max_write __P((DB_ENV *, int *, int *));
-int __memp_set_mp_max_write __P((DB_ENV *, int, int));
+int __memp_get_mp_max_write __P((DB_ENV *, int *, db_timeout_t *));
+int __memp_set_mp_max_write __P((DB_ENV *, int, db_timeout_t));
 int __memp_get_mp_mmapsize __P((DB_ENV *, size_t *));
 int __memp_set_mp_mmapsize __P((DB_ENV *, size_t));
 int __memp_nameop __P((DB_ENV *, u_int8_t *, const char *, const char *, const char *, int));
@@ -64,22 +64,28 @@ int __memp_bh_settxn __P((DB_MPOOL *, MPOOLFILE *mfp, BH *, void *));
 int __memp_skip_curadj __P((DBC *, db_pgno_t));
 int __memp_bh_freeze __P((DB_MPOOL *, REGINFO *, DB_MPOOL_HASH *, BH *, int *));
 int __memp_bh_thaw __P((DB_MPOOL *, REGINFO *, DB_MPOOL_HASH *, BH *, BH *));
-int __memp_open __P((DB_ENV *));
+int __memp_open __P((DB_ENV *, int));
+int	__memp_init __P((DB_ENV *, DB_MPOOL *, u_int, u_int32_t, u_int));
+u_int32_t __memp_max_regions __P((DB_ENV *));
 u_int32_t __memp_region_mutex_count __P((DB_ENV *));
-int __memp_dbenv_refresh __P((DB_ENV *));
+int __memp_env_refresh __P((DB_ENV *));
 int __memp_register_pp __P((DB_ENV *, int, int (*)(DB_ENV *, db_pgno_t, void *, DBT *), int (*)(DB_ENV *, db_pgno_t, void *, DBT *)));
 int __memp_register __P((DB_ENV *, int, int (*)(DB_ENV *, db_pgno_t, void *, DBT *), int (*)(DB_ENV *, db_pgno_t, void *, DBT *)));
+int __memp_get_bucket __P((DB_MPOOLFILE *, db_pgno_t, REGINFO **, DB_MPOOL_HASH **));
+int __memp_resize __P((DB_MPOOL *, u_int32_t, u_int32_t));
+int __memp_get_cache_max __P((DB_ENV *, u_int32_t *, u_int32_t *));
+int __memp_set_cache_max __P((DB_ENV *, u_int32_t, u_int32_t));
 int __memp_stat_pp __P((DB_ENV *, DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
 int __memp_stat_print_pp __P((DB_ENV *, u_int32_t));
 int  __memp_stat_print __P((DB_ENV *, u_int32_t));
 void __memp_stat_hash __P((REGINFO *, MPOOL *, u_int32_t *));
 int __memp_walk_files __P((DB_ENV *, MPOOL *, int (*) __P((DB_ENV *, MPOOLFILE *, void *, u_int32_t *, u_int32_t)), void *, u_int32_t *, u_int32_t));
 int __memp_sync_pp __P((DB_ENV *, DB_LSN *));
-int __memp_sync __P((DB_ENV *, DB_LSN *));
+int __memp_sync __P((DB_ENV *, u_int32_t, DB_LSN *));
 int __memp_fsync_pp __P((DB_MPOOLFILE *));
 int __memp_fsync __P((DB_MPOOLFILE *));
 int __mp_xxx_fh __P((DB_MPOOLFILE *, DB_FH **));
-int __memp_sync_int __P((DB_ENV *, DB_MPOOLFILE *, u_int32_t, db_sync_op, u_int32_t *));
+int __memp_sync_int __P((DB_ENV *, DB_MPOOLFILE *, u_int32_t, u_int32_t, u_int32_t *, int *));
 int __memp_mf_sync __P((DB_MPOOL *, MPOOLFILE *, int));
 int __memp_trickle_pp __P((DB_ENV *, int, int *));
 
diff --git a/db/dbinc_auto/mutex_ext.h b/db/dbinc_auto/mutex_ext.h
index 7b06e67d1..e3abbf77d 100644
--- a/db/dbinc_auto/mutex_ext.h
+++ b/db/dbinc_auto/mutex_ext.h
@@ -31,10 +31,11 @@ int __db_pthread_mutex_init __P((DB_ENV *, db_mutex_t, u_int32_t));
 int __db_pthread_mutex_lock __P((DB_ENV *, db_mutex_t));
 int __db_pthread_mutex_unlock __P((DB_ENV *, db_mutex_t));
 int __db_pthread_mutex_destroy __P((DB_ENV *, db_mutex_t));
-int __mutex_open __P((DB_ENV *));
-int __mutex_dbenv_refresh __P((DB_ENV *));
+int __mutex_open __P((DB_ENV *, int));
+int __mutex_env_refresh __P((DB_ENV *));
 void __mutex_resource_return __P((DB_ENV *, REGINFO *));
-int __mutex_stat __P((DB_ENV *, DB_MUTEX_STAT **, u_int32_t));
+int __mutex_stat_pp __P((DB_ENV *, DB_MUTEX_STAT **, u_int32_t));
+int __mutex_stat_print_pp __P((DB_ENV *, u_int32_t));
 int __mutex_stat_print __P((DB_ENV *, u_int32_t));
 void __mutex_print_debug_single __P((DB_ENV *, const char *, db_mutex_t, u_int32_t));
 void __mutex_print_debug_stats __P((DB_ENV *, DB_MSGBUF *, db_mutex_t, u_int32_t));
diff --git a/db/dbinc_auto/os_ext.h b/db/dbinc_auto/os_ext.h
index 2481c42b8..d02dc0b48 100644
--- a/db/dbinc_auto/os_ext.h
+++ b/db/dbinc_auto/os_ext.h
@@ -6,6 +6,7 @@
 extern "C" {
 #endif
 
+void __os_abort __P((void));
 int __os_abspath __P((const char *));
 int __os_umalloc __P((DB_ENV *, size_t, void *));
 int __os_urealloc __P((DB_ENV *, size_t, void *));
@@ -16,7 +17,7 @@ int __os_malloc __P((DB_ENV *, size_t, void *));
 int __os_realloc __P((DB_ENV *, size_t, void *));
 void __os_free __P((DB_ENV *, void *));
 void *__ua_memcpy __P((void *, const void *, size_t));
-void __os_clock __P((DB_ENV *, u_int32_t *, u_int32_t *));
+void __os_gettime __P((DB_ENV *, db_timespec *));
 int __os_fs_notzero __P((void));
 int __os_support_direct_io __P((void));
 int __os_support_db_register __P((void));
@@ -44,11 +45,7 @@ int __os_unmapfile __P((DB_ENV *, void *, size_t));
 int __os_mkdir __P((DB_ENV *, const char *, int));
 u_int32_t __db_oflags __P((int));
 int __db_omode __P((const char *));
-int __os_open __P((DB_ENV *, const char *, u_int32_t, int, DB_FH **));
-int __os_open_extend __P((DB_ENV *, const char *, u_int32_t, u_int32_t, int, DB_FH **));
-#ifdef HAVE_QNX
-int __os_shmname __P((DB_ENV *, const char *, char **));
-#endif
+int __os_open __P((DB_ENV *, const char *, u_int32_t, u_int32_t, int, DB_FH **));
 void __os_id __P((DB_ENV *, pid_t *, db_threadid_t*));
 int __os_r_attach __P((DB_ENV *, REGINFO *, REGION *));
 int __os_r_detach __P((DB_ENV *, REGINFO *, int));
@@ -70,8 +67,41 @@ void __os_unique_id __P((DB_ENV *, u_int32_t *));
 int __os_region_unlink __P((DB_ENV *, const char *));
 int __os_unlink __P((DB_ENV *, const char *));
 void __os_yield __P((DB_ENV *));
+#ifndef HAVE_FCLOSE
+int fclose __P((FILE *));
+#endif
+#ifndef HAVE_FGETC
+int fgetc __P((FILE *));
+#endif
+#ifndef HAVE_FGETS
+char *fgets __P((char *, int, FILE *));
+#endif
+#ifndef HAVE_FOPEN
+FILE *fopen __P((const char *, const char *));
+#endif
+#ifndef HAVE_FWRITE
+size_t fwrite __P((const void *, size_t, size_t, FILE *));
+#endif
+#ifndef HAVE_LOCALTIME
+struct tm *localtime __P((const time_t *));
+#endif
+#ifndef HAVE_TIME
+time_t time __P((time_t *));
+#endif
+#ifdef HAVE_QNX
+int __os_qnx_region_open __P((DB_ENV *, const char *, int, int, DB_FH *));
+#endif
+#ifdef HAVE_QNX
+int __os_qnx_shmname __P((DB_ENV *, const char *, char **));
+#endif
+#ifndef HAVE_TIME
+time_t time __P((time_t *));
+#endif
 int __os_is_winnt __P((void));
+#ifdef HAVE_REPLICATION_THREADS
 int __os_get_neterr __P((void));
+#endif
+int __os_mkdir __P((DB_ENV *, const char *, int));
 
 #if defined(__cplusplus)
 }
diff --git a/db/dbinc_auto/qam_ext.h b/db/dbinc_auto/qam_ext.h
index 4c0571f1d..881b31107 100644
--- a/db/dbinc_auto/qam_ext.h
+++ b/db/dbinc_auto/qam_ext.h
@@ -9,8 +9,8 @@ extern "C" {
 int __qam_position __P((DBC *, db_recno_t *, db_lockmode_t, u_int32_t, int *));
 int __qam_pitem __P((DBC *,  QPAGE *, u_int32_t, db_recno_t, DBT *));
 int __qam_append __P((DBC *, DBT *, DBT *));
-int __qam_c_dup __P((DBC *, DBC *));
-int __qam_c_init __P((DBC *));
+int __qamc_dup __P((DBC *, DBC *));
+int __qamc_init __P((DBC *));
 int __qam_truncate __P((DBC *, u_int32_t *));
 int __qam_delete __P((DBC *,  DBT *));
 int __qam_incfirst_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_recno_t, db_pgno_t));
@@ -32,11 +32,11 @@ int __qam_delext_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
 int __qam_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
 int __qam_mswap __P((PAGE *));
 int __qam_pgin_out __P((DB_ENV *, db_pgno_t, void *, DBT *));
-int __qam_fprobe __P((DB *, db_pgno_t, DB_TXN *, void *, qam_probe_mode, u_int32_t));
+int __qam_fprobe __P((DB *, db_pgno_t, DB_TXN *, void *, qam_probe_mode, DB_CACHE_PRIORITY, u_int32_t));
 int __qam_fclose __P((DB *, db_pgno_t));
 int __qam_fremove __P((DB *, db_pgno_t));
 int __qam_sync __P((DB *));
-int __qam_gen_filelist __P(( DB *, QUEUE_FILELIST **));
+int __qam_gen_filelist __P((DB *, QUEUE_FILELIST **));
 int __qam_extent_names __P((DB_ENV *, char *, char ***));
 void __qam_exid __P((DB *, u_int8_t *, u_int32_t));
 int __qam_nameop __P((DB *, DB_TXN *, const char *, qam_name_op));
diff --git a/db/dbinc_auto/rep_ext.h b/db/dbinc_auto/rep_ext.h
index 9430a895c..0dffcb72d 100644
--- a/db/dbinc_auto/rep_ext.h
+++ b/db/dbinc_auto/rep_ext.h
@@ -19,18 +19,27 @@ int __rep_page_fail __P((DB_ENV *, int, DBT *));
 int __rep_init_cleanup __P((DB_ENV *, REP *, int));
 int __rep_pggap_req __P((DB_ENV *, REP *, __rep_fileinfo_args *, u_int32_t));
 int __rep_finfo_alloc __P((DB_ENV *, __rep_fileinfo_args *, __rep_fileinfo_args **));
-int __rep_elect __P((DB_ENV *, int, int, int *, u_int32_t));
-int __rep_vote1 __P((DB_ENV *, REP_CONTROL *, DBT *, int *));
-int __rep_vote2 __P((DB_ENV *, DBT *, int *));
-void __rep_elect_master __P((DB_ENV *, REP *, int *));
+int __rep_remove_init_file __P((DB_ENV *));
+int __rep_reset_init __P((DB_ENV *));
+int __rep_elect __P((DB_ENV *, int, int, u_int32_t));
+int __rep_vote1 __P((DB_ENV *, REP_CONTROL *, DBT *, int));
+int __rep_vote2 __P((DB_ENV *, DBT *, int));
+int __rep_update_grant __P((DB_ENV *, db_timespec *));
+int __rep_islease_granted __P((DB_ENV *));
+int __rep_lease_table_alloc __P((DB_ENV *, int));
+int __rep_lease_grant __P((DB_ENV *, REP_CONTROL *, DBT *, int));
+int __rep_lease_check __P((DB_ENV *, int));
+int __rep_lease_refresh __P((DB_ENV *));
+int __rep_lease_expire __P((DB_ENV *, int));
+db_timeout_t __rep_lease_waittime __P((DB_ENV *));
 int __rep_allreq __P((DB_ENV *, REP_CONTROL *, int));
 int __rep_log __P((DB_ENV *, REP_CONTROL *, DBT *, time_t, DB_LSN *));
 int __rep_bulk_log __P((DB_ENV *, REP_CONTROL *, DBT *, time_t, DB_LSN *));
 int __rep_logreq __P((DB_ENV *, REP_CONTROL *, DBT *, int));
 int __rep_loggap_req __P((DB_ENV *, REP *, DB_LSN *, u_int32_t));
 int __rep_logready __P((DB_ENV *, REP *, time_t, DB_LSN *));
-int __rep_dbenv_create __P((DB_ENV *));
-void __rep_dbenv_destroy __P((DB_ENV *));
+int __rep_env_create __P((DB_ENV *));
+void __rep_env_destroy __P((DB_ENV *));
 int __rep_get_config __P((DB_ENV *, u_int32_t, int *));
 int __rep_set_config __P((DB_ENV *, u_int32_t, int));
 int __rep_start __P((DB_ENV *, DBT *, u_int32_t));
@@ -46,19 +55,21 @@ int __rep_get_timeout __P((DB_ENV *, int, db_timeout_t *));
 int __rep_get_request __P((DB_ENV *, u_int32_t *, u_int32_t *));
 int __rep_set_request __P((DB_ENV *, u_int32_t, u_int32_t));
 int __rep_set_transport __P((DB_ENV *, int, int (*)(DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)));
+int __rep_set_lease __P((DB_ENV *, u_int32_t, u_int32_t));
 int __rep_flush __P((DB_ENV *));
 int __rep_sync __P((DB_ENV *, u_int32_t));
-int __rep_process_message __P((DB_ENV *, DBT *, DBT *, int *, DB_LSN *));
+int __rep_process_message __P((DB_ENV *, DBT *, DBT *, int, DB_LSN *));
 int __rep_apply __P((DB_ENV *, REP_CONTROL *, DBT *, DB_LSN *, int *, DB_LSN *));
 int __rep_process_txn __P((DB_ENV *, DBT *));
+int __rep_resend_req __P((DB_ENV *, int));
 int __rep_check_doreq __P((DB_ENV *, REP *));
 int __rep_open __P((DB_ENV *));
-int __rep_region_destroy __P((DB_ENV *));
-void __rep_dbenv_refresh __P((DB_ENV *));
-int __rep_close __P((DB_ENV *));
+int __rep_env_refresh __P((DB_ENV *));
+int __rep_env_close __P((DB_ENV *));
 int __rep_preclose __P((DB_ENV *));
-int __rep_closefiles __P((DB_ENV *));
+int __rep_closefiles __P((DB_ENV *, int));
 int __rep_write_egen __P((DB_ENV *, u_int32_t));
+int __rep_write_gen __P((DB_ENV *, u_int32_t));
 int __rep_stat_pp __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
 int __rep_stat_print_pp __P((DB_ENV *, u_int32_t));
 int __rep_stat_print __P((DB_ENV *, u_int32_t));
@@ -71,19 +82,21 @@ int __rep_new_master __P((DB_ENV *, REP_CONTROL *, int));
 int __rep_noarchive __P((DB_ENV *));
 void __rep_send_vote __P((DB_ENV *, DB_LSN *, int, int, int, u_int32_t, u_int32_t, int, u_int32_t, u_int32_t));
 void __rep_elect_done __P((DB_ENV *, REP *));
-int __rep_grow_sites __P((DB_ENV *dbenv, int nsites));
+int __rep_grow_sites __P((DB_ENV *, int));
 int __env_rep_enter __P((DB_ENV *, int));
 int __env_db_rep_exit __P((DB_ENV *));
 int __db_rep_enter __P((DB *, int, int, int));
 int __op_rep_enter __P((DB_ENV *));
 int __op_rep_exit __P((DB_ENV *));
-int __rep_get_gen __P((DB_ENV *, u_int32_t *));
 int __rep_lockout_api __P((DB_ENV *, REP *));
+int __rep_lockout_apply __P((DB_ENV *, REP *, u_int32_t));
 int __rep_lockout_msg __P((DB_ENV *, REP *, u_int32_t));
-int __rep_send_throttle __P((DB_ENV *, int, REP_THROTTLE *, u_int32_t));
+int __rep_send_throttle __P((DB_ENV *, int, REP_THROTTLE *, u_int32_t, u_int32_t));
 u_int32_t __rep_msg_to_old __P((u_int32_t, u_int32_t));
 u_int32_t __rep_msg_from_old __P((u_int32_t, u_int32_t));
+void __rep_print __P((DB_ENV *, const char *, ...)) __attribute__ ((__format__ (__printf__, 2, 3)));
 void __rep_print_message __P((DB_ENV *, int, REP_CONTROL *, char *, u_int32_t));
+void __rep_fire_event __P((DB_ENV *, u_int32_t, void *));
 int __rep_verify __P((DB_ENV *, REP_CONTROL *, DBT *, int, time_t));
 int __rep_verify_fail __P((DB_ENV *, REP_CONTROL *, int));
 int __rep_verify_req __P((DB_ENV *, REP_CONTROL *, int));
diff --git a/db/dbinc_auto/repmgr_ext.h b/db/dbinc_auto/repmgr_ext.h
index 78979b987..eeefd4451 100644
--- a/db/dbinc_auto/repmgr_ext.h
+++ b/db/dbinc_auto/repmgr_ext.h
@@ -12,13 +12,14 @@ int __repmgr_start __P((DB_ENV *, int, u_int32_t));
 int __repmgr_close __P((DB_ENV *));
 int __repmgr_set_ack_policy __P((DB_ENV *, int));
 int __repmgr_get_ack_policy __P((DB_ENV *, int *));
-int __repmgr_dbenv_create __P((DB_ENV *, DB_REP *));
-void __repmgr_dbenv_destroy __P((DB_ENV *, DB_REP *));
+int __repmgr_env_create __P((DB_ENV *, DB_REP *));
+void __repmgr_env_destroy __P((DB_ENV *, DB_REP *));
 int __repmgr_stop_threads __P((DB_ENV *));
 int __repmgr_set_local_site __P((DB_ENV *, const char *, u_int, u_int32_t));
 int __repmgr_add_remote_site __P((DB_ENV *, const char *, u_int, int *, u_int32_t));
 void *__repmgr_msg_thread __P((void *));
-int __repmgr_stash_generation __P((DB_ENV *));
+int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *));
+void __repmgr_stash_generation __P((DB_ENV *));
 int __repmgr_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t));
 int __repmgr_send_one __P((DB_ENV *, REPMGR_CONNECTION *, u_int, const DBT *, const DBT *));
 int __repmgr_is_permanent __P((DB_ENV *, const DB_LSN *));
@@ -47,7 +48,6 @@ int __repmgr_signal __P((cond_var_t *));
 int __repmgr_wake_main_thread __P((DB_ENV*));
 int __repmgr_writev __P((socket_t, db_iovec_t *, int, size_t *));
 int __repmgr_readv __P((socket_t, db_iovec_t *, int, size_t *));
-void __repmgr_timeval_diff_current __P((DB_ENV *, repmgr_timeval_t *, select_timeout_t *));
 int __repmgr_select_loop __P((DB_ENV *));
 int __repmgr_queue_create __P((DB_ENV *, DB_REP *));
 void __repmgr_queue_destroy __P((DB_ENV *));
@@ -62,8 +62,39 @@ int __repmgr_connect_site __P((DB_ENV *, u_int eid));
 int __repmgr_send_handshake __P((DB_ENV *, REPMGR_CONNECTION *));
 int __repmgr_read_from_site __P((DB_ENV *, REPMGR_CONNECTION *));
 int __repmgr_write_some __P((DB_ENV *, REPMGR_CONNECTION *));
+int __repmgr_stat_pp __P((DB_ENV *, DB_REPMGR_STAT **, u_int32_t));
+int __repmgr_stat_print_pp __P((DB_ENV *, u_int32_t));
 int __repmgr_site_list __P((DB_ENV *, u_int *, DB_REPMGR_SITE **));
-int __repmgr_print_stats __P((DB_ENV *));
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_close __P((DB_ENV *));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_add_remote_site __P((DB_ENV *, const char *, u_int, int *, u_int32_t));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_get_ack_policy __P((DB_ENV *, int *));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_set_ack_policy __P((DB_ENV *, int));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_set_local_site __P((DB_ENV *, const char *, u_int, u_int32_t));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_site_list __P((DB_ENV *, u_int *, DB_REPMGR_SITE **));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_start __P((DB_ENV *, int, u_int32_t));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_stat_pp __P((DB_ENV *, DB_REPMGR_STAT **, u_int32_t));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_stat_print_pp __P((DB_ENV *, u_int32_t));
+#endif
+#ifndef HAVE_REPLICATION_THREADS
+int __repmgr_handle_event __P((DB_ENV *, u_int32_t, void *));
+#endif
 int __repmgr_schedule_connection_attempt __P((DB_ENV *, u_int, int));
 void __repmgr_reset_for_reading __P((REPMGR_CONNECTION *));
 int __repmgr_new_connection __P((DB_ENV *, REPMGR_CONNECTION **, socket_t, u_int32_t));
@@ -74,11 +105,12 @@ void __repmgr_add_buffer __P((REPMGR_IOVECS *, void *, size_t));
 void __repmgr_add_dbt __P((REPMGR_IOVECS *, const DBT *));
 int __repmgr_update_consumed __P((REPMGR_IOVECS *, size_t));
 int __repmgr_prepare_my_addr __P((DB_ENV *, DBT *));
-int __repmgr_timeval_cmp __P((repmgr_timeval_t *, repmgr_timeval_t *));
 u_int __repmgr_get_nsites __P((DB_REP *));
 void __repmgr_thread_failure __P((DB_ENV *, int));
 char *__repmgr_format_eid_loc __P((DB_REP *, int, char *));
 char *__repmgr_format_site_loc __P((REPMGR_SITE *, char *));
+void __repmgr_timespec_diff_now __P((DB_ENV *, db_timespec *, db_timespec *));
+int __repmgr_repstart __P((DB_ENV *, u_int32_t));
 int __repmgr_wsa_init __P((DB_ENV *));
 
 #if defined(__cplusplus)
diff --git a/db/dbinc_auto/rpc_client_ext.h b/db/dbinc_auto/rpc_client_ext.h
index a578bbcd1..bc64116a0 100644
--- a/db/dbinc_auto/rpc_client_ext.h
+++ b/db/dbinc_auto/rpc_client_ext.h
@@ -50,6 +50,7 @@ int __dbcl_db_get_h_nelem __P((DB *, u_int32_t *));
 int __dbcl_db_get_lorder __P((DB *, int *));
 int __dbcl_db_get_open_flags __P((DB *, u_int32_t *));
 int __dbcl_db_get_pagesize __P((DB *, u_int32_t *));
+int __dbcl_db_get_priority __P((DB *, DB_CACHE_PRIORITY *));
 int __dbcl_db_get_q_extentsize __P((DB *, u_int32_t *));
 int __dbcl_db_get_re_delim __P((DB *, int *));
 int __dbcl_db_get_re_len __P((DB *, u_int32_t *));
@@ -68,6 +69,7 @@ int __dbcl_db_set_h_ffactor __P((DB *, u_int32_t));
 int __dbcl_db_set_h_nelem __P((DB *, u_int32_t));
 int __dbcl_db_set_lorder __P((DB *, int));
 int __dbcl_db_set_pagesize __P((DB *, u_int32_t));
+int __dbcl_db_set_priority __P((DB *, DB_CACHE_PRIORITY));
 int __dbcl_db_set_q_extentsize __P((DB *, u_int32_t));
 int __dbcl_db_set_re_delim __P((DB *, int));
 int __dbcl_db_set_re_len __P((DB *, u_int32_t));
@@ -75,13 +77,15 @@ int __dbcl_db_set_re_pad __P((DB *, int));
 int __dbcl_db_stat __P((DB *, DB_TXN *, void *, u_int32_t));
 int __dbcl_db_sync __P((DB *, u_int32_t));
 int __dbcl_db_truncate __P((DB *, DB_TXN *, u_int32_t  *, u_int32_t));
-int __dbcl_dbc_c_close __P((DBC *));
-int __dbcl_dbc_c_count __P((DBC *, db_recno_t *, u_int32_t));
-int __dbcl_dbc_c_del __P((DBC *, u_int32_t));
-int __dbcl_dbc_c_dup __P((DBC *, DBC **, u_int32_t));
-int __dbcl_dbc_c_get __P((DBC *, DBT *, DBT *, u_int32_t));
-int __dbcl_dbc_c_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
-int __dbcl_dbc_c_put __P((DBC *, DBT *, DBT *, u_int32_t));
+int __dbcl_dbc_close __P((DBC *));
+int __dbcl_dbc_count __P((DBC *, db_recno_t *, u_int32_t));
+int __dbcl_dbc_del __P((DBC *, u_int32_t));
+int __dbcl_dbc_dup __P((DBC *, DBC **, u_int32_t));
+int __dbcl_dbc_get __P((DBC *, DBT *, DBT *, u_int32_t));
+int __dbcl_dbc_get_priority __P((DBC *, DB_CACHE_PRIORITY *));
+int __dbcl_dbc_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
+int __dbcl_dbc_put __P((DBC *, DBT *, DBT *, u_int32_t));
+int __dbcl_dbc_set_priority __P((DBC *, DB_CACHE_PRIORITY));
 int __dbcl_txn_abort __P((DB_TXN *));
 int __dbcl_txn_commit __P((DB_TXN *, u_int32_t));
 int __dbcl_txn_discard __P((DB_TXN *, u_int32_t));
@@ -112,12 +116,12 @@ int __dbcl_db_stat_ret __P((DB *, DB_TXN *, void *, u_int32_t, __db_stat_reply *
 int __dbcl_db_truncate_ret __P((DB *, DB_TXN *, u_int32_t  *, u_int32_t, __db_truncate_reply *));
 int __dbcl_db_cursor_ret __P((DB *, DB_TXN *, DBC **, u_int32_t, __db_cursor_reply *));
 int __dbcl_db_join_ret __P((DB *, DBC **, DBC **, u_int32_t, __db_join_reply *));
-int __dbcl_dbc_c_close_ret __P((DBC *, __dbc_c_close_reply *));
-int __dbcl_dbc_c_count_ret __P((DBC *, db_recno_t *, u_int32_t, __dbc_c_count_reply *));
-int __dbcl_dbc_c_dup_ret __P((DBC *, DBC **, u_int32_t, __dbc_c_dup_reply *));
-int __dbcl_dbc_c_get_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_c_get_reply *));
-int __dbcl_dbc_c_pget_ret __P((DBC *, DBT *, DBT *, DBT *, u_int32_t, __dbc_c_pget_reply *));
-int __dbcl_dbc_c_put_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_c_put_reply *));
+int __dbcl_dbc_close_ret __P((DBC *, __dbc_close_reply *));
+int __dbcl_dbc_count_ret __P((DBC *, db_recno_t *, u_int32_t, __dbc_count_reply *));
+int __dbcl_dbc_dup_ret __P((DBC *, DBC **, u_int32_t, __dbc_dup_reply *));
+int __dbcl_dbc_get_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_get_reply *));
+int __dbcl_dbc_pget_ret __P((DBC *, DBT *, DBT *, DBT *, u_int32_t, __dbc_pget_reply *));
+int __dbcl_dbc_put_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_put_reply *));
 
 #if defined(__cplusplus)
 }
diff --git a/db/dbinc_auto/rpc_server_ext.h b/db/dbinc_auto/rpc_server_ext.h
index 589aef156..cd330a5ac 100644
--- a/db/dbinc_auto/rpc_server_ext.h
+++ b/db/dbinc_auto/rpc_server_ext.h
@@ -54,6 +54,8 @@ void __db_get_pagesize_proc __P((u_int, __db_get_pagesize_reply *));
 void __db_set_pagesize_proc __P((u_int, u_int32_t, __db_set_pagesize_reply *));
 void __db_pget_proc __P((u_int, u_int, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_pget_reply *, int *));
 void __db_put_proc __P((u_int, u_int, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_put_reply *, int *));
+void __db_get_priority_proc __P((u_int, __db_get_priority_reply *));
+void __db_set_priority_proc __P((u_int, u_int32_t, __db_set_priority_reply *));
 void __db_get_re_delim_proc __P((u_int, __db_get_re_delim_reply *));
 void __db_set_re_delim_proc __P((u_int, u_int32_t, __db_set_re_delim_reply *));
 void __db_get_re_len_proc __P((u_int, __db_get_re_len_reply *));
@@ -67,13 +69,15 @@ void __db_sync_proc __P((u_int, u_int32_t, __db_sync_reply *));
 void __db_truncate_proc __P((u_int, u_int, u_int32_t, __db_truncate_reply *));
 void __db_cursor_proc __P((u_int, u_int, u_int32_t, __db_cursor_reply *));
 void __db_join_proc __P((u_int, u_int32_t *, u_int32_t, u_int32_t, __db_join_reply *));
-void __dbc_c_close_proc __P((u_int, __dbc_c_close_reply *));
-void __dbc_c_count_proc __P((u_int, u_int32_t, __dbc_c_count_reply *));
-void __dbc_c_del_proc __P((u_int, u_int32_t, __dbc_c_del_reply *));
-void __dbc_c_dup_proc __P((u_int, u_int32_t, __dbc_c_dup_reply *));
-void __dbc_c_get_proc __P((u_int, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_c_get_reply *, int *));
-void __dbc_c_pget_proc __P((u_int, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_c_pget_reply *, int *));
-void __dbc_c_put_proc __P((u_int, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_c_put_reply *, int *));
+void __dbc_close_proc __P((u_int, __dbc_close_reply *));
+void __dbc_count_proc __P((u_int, u_int32_t, __dbc_count_reply *));
+void __dbc_del_proc __P((u_int, u_int32_t, __dbc_del_reply *));
+void __dbc_dup_proc __P((u_int, u_int32_t, __dbc_dup_reply *));
+void __dbc_get_proc __P((u_int, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_get_reply *, int *));
+void __dbc_pget_proc __P((u_int, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_pget_reply *, int *));
+void __dbc_put_proc __P((u_int, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_put_reply *, int *));
+void __dbc_get_priority_proc __P((u_int, __dbc_get_priority_reply *));
+void __dbc_set_priority_proc __P((u_int, u_int32_t, __dbc_set_priority_reply *));
 void __dbsrv_settimeout __P((ct_entry *, u_int32_t));
 void __dbclear_ctp __P((ct_entry *));
 void __dbdel_ctp __P((ct_entry *));
diff --git a/db/dbinc_auto/tcl_ext.h b/db/dbinc_auto/tcl_ext.h
index e5395c539..d1a939b7d 100644
--- a/db/dbinc_auto/tcl_ext.h
+++ b/db/dbinc_auto/tcl_ext.h
@@ -76,13 +76,16 @@ int tcl_RepGetConfig __P((Tcl_Interp *, DB_ENV *, Tcl_Obj *));
 int tcl_RepElect __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
 int tcl_RepFlush __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
 int tcl_RepSync __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
+int tcl_RepLease  __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
 int tcl_RepLimit __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
 int tcl_RepRequest __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
+int tcl_RepNoarchiveTimeout __P((Tcl_Interp *, DB_ENV *));
 int tcl_RepTransport  __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *, DBTCL_INFO *));
 int tcl_RepStart __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
 int tcl_RepProcessMessage __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
 int tcl_RepStat __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
 int tcl_RepMgr __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
+int tcl_RepMgrStat __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
 int seq_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
 void _TxnInfoDelete __P((Tcl_Interp *, DBTCL_INFO *));
 int tcl_TxnCheckpoint __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
diff --git a/db/dbinc_auto/txn_auto.h b/db/dbinc_auto/txn_auto.h
index ec3eb2081..72fe932d4 100644
--- a/db/dbinc_auto/txn_auto.h
+++ b/db/dbinc_auto/txn_auto.h
@@ -43,7 +43,7 @@ typedef struct ___txn_ckp_args {
 	DB_LSN	last_ckp;
 	int32_t	timestamp;
 	u_int32_t	envid;
-	u_int32_t	rep_gen;
+	u_int32_t	spare;
 } __txn_ckp_args;
 
 #define	DB___txn_child	12
diff --git a/db/dbinc_auto/txn_ext.h b/db/dbinc_auto/txn_ext.h
index 48ba76efc..34bbdf574 100644
--- a/db/dbinc_auto/txn_ext.h
+++ b/db/dbinc_auto/txn_ext.h
@@ -11,7 +11,7 @@ int __txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
 int __txn_xa_begin __P((DB_ENV *, DB_TXN *));
 int __txn_recycle_id __P((DB_ENV *));
 int __txn_compensate_begin __P((DB_ENV *, DB_TXN **));
-void __txn_continue __P((DB_ENV *, DB_TXN *, TXN_DETAIL *));
+int __txn_continue __P((DB_ENV *, DB_TXN *, TXN_DETAIL *));
 int __txn_commit __P((DB_TXN *, u_int32_t));
 int __txn_abort __P((DB_TXN *));
 int __txn_discard_int __P((DB_TXN *, u_int32_t flags));
@@ -51,8 +51,8 @@ int __txn_getactive __P((DB_ENV *, DB_LSN *));
 int __txn_getckp __P((DB_ENV *, DB_LSN *));
 int __txn_updateckp __P((DB_ENV *, DB_LSN *));
 int __txn_failchk __P((DB_ENV *));
-int __txn_dbenv_create __P((DB_ENV *));
-void __txn_dbenv_destroy __P((DB_ENV *));
+int __txn_env_create __P((DB_ENV *));
+void __txn_env_destroy __P((DB_ENV *));
 int __txn_get_tx_max __P((DB_ENV *, u_int32_t *));
 int __txn_set_tx_max __P((DB_ENV *, u_int32_t));
 int __txn_get_tx_timestamp __P((DB_ENV *, time_t *));
@@ -70,9 +70,10 @@ int __txn_recover_pp __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t));
 int __txn_recover __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t));
 int __txn_get_prepared __P((DB_ENV *, XID *, DB_PREPLIST *, long, long *, u_int32_t));
 int __txn_openfiles __P((DB_ENV *, DB_LSN *, int));
-int __txn_open __P((DB_ENV *));
+int __txn_open __P((DB_ENV *, int));
 int __txn_findlastckp __P((DB_ENV *, DB_LSN *, DB_LSN *));
-int __txn_dbenv_refresh __P((DB_ENV *));
+int __txn_env_refresh __P((DB_ENV *));
+u_int32_t __txn_region_mutex_count __P((DB_ENV *));
 int __txn_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
 int __txn_oldest_reader __P((DB_ENV *, DB_LSN *));
 int __txn_add_buffer __P((DB_ENV *, TXN_DETAIL *));
@@ -83,9 +84,11 @@ int  __txn_stat_print __P((DB_ENV *, u_int32_t));
 int __txn_closeevent __P((DB_ENV *, DB_TXN *, DB *));
 int __txn_remevent __P((DB_ENV *, DB_TXN *, const char *, u_int8_t *, int));
 void __txn_remrem __P((DB_ENV *, DB_TXN *, const char *));
-int __txn_lockevent __P((DB_ENV *, DB_TXN *, DB *, DB_LOCK *, u_int32_t));
-void __txn_remlock __P((DB_ENV *, DB_TXN *, DB_LOCK *, u_int32_t));
+int __txn_lockevent __P((DB_ENV *, DB_TXN *, DB *, DB_LOCK *, DB_LOCKER *));
+void __txn_remlock __P((DB_ENV *, DB_TXN *, DB_LOCK *, DB_LOCKER *));
 int __txn_doevents __P((DB_ENV *, DB_TXN *, int, int));
+int __txn_record_fname __P((DB_ENV *, DB_TXN *, FNAME *));
+int __txn_dref_fname __P((DB_ENV *, DB_TXN *));
 
 #if defined(__cplusplus)
 }