Changes to create storage directory for storage engines.

storage/heap/.cvsignore:
  mvdir
storage/heap/ChangeLog:
  mvdir
storage/heap/Makefile.am:
  mvdir
storage/heap/_check.c:
  mvdir
storage/heap/_rectest.c:
  mvdir
storage/heap/heapdef.h:
  mvdir
storage/heap/hp_block.c:
  mvdir
storage/heap/hp_clear.c:
  mvdir
storage/heap/hp_close.c:
  mvdir
storage/heap/hp_create.c:
  mvdir
storage/heap/hp_delete.c:
  mvdir
storage/heap/hp_extra.c:
  mvdir
storage/heap/hp_hash.c:
  mvdir
storage/heap/hp_info.c:
  mvdir
storage/heap/hp_open.c:
  mvdir
storage/heap/hp_panic.c:
  mvdir
storage/heap/hp_rename.c:
  mvdir
storage/heap/hp_rfirst.c:
  mvdir
storage/heap/hp_rkey.c:
  mvdir
storage/heap/hp_rlast.c:
  mvdir
storage/heap/hp_rnext.c:
  mvdir
storage/heap/hp_rprev.c:
  mvdir
storage/heap/hp_rrnd.c:
  mvdir
storage/heap/hp_rsame.c:
  mvdir
storage/heap/hp_scan.c:
  mvdir
storage/heap/hp_static.c:
  mvdir
storage/heap/hp_test1.c:
  mvdir
storage/heap/hp_test2.c:
  mvdir
storage/heap/hp_update.c:
  mvdir
storage/heap/hp_write.c:
  mvdir
storage/heap/make-ccc:
  mvdir
storage/myisam/.cvsignore:
  mvdir
storage/myisam/ChangeLog:
  mvdir
storage/myisam/Makefile.am:
  mvdir
storage/myisam/NEWS:
  mvdir
storage/myisam/TODO:
  mvdir
storage/myisam/ft_boolean_search.c:
  mvdir
storage/myisam/ft_eval.c:
  mvdir
storage/myisam/ft_eval.h:
  mvdir
storage/myisam/ft_nlq_search.c:
  mvdir
storage/myisam/ft_parser.c:
  mvdir
storage/myisam/ft_static.c:
  mvdir
storage/myisam/ft_stem.c:
  mvdir
storage/myisam/ft_stopwords.c:
  mvdir
storage/myisam/ft_test1.c:
  mvdir
storage/myisam/ft_test1.h:
  mvdir
storage/myisam/ft_update.c:
  mvdir
storage/myisam/ftdefs.h:
  mvdir
storage/myisam/fulltext.h:
  mvdir
storage/myisam/make-ccc:
  mvdir
storage/myisam/mi_cache.c:
  mvdir
storage/myisam/mi_changed.c:
  mvdir
storage/myisam/mi_check.c:
  mvdir
storage/myisam/mi_checksum.c:
  mvdir
storage/myisam/mi_close.c:
  mvdir
storage/myisam/mi_create.c:
  mvdir
storage/myisam/mi_dbug.c:
  mvdir
storage/myisam/mi_delete.c:
  mvdir
storage/myisam/mi_delete_all.c:
  mvdir
storage/myisam/mi_delete_table.c:
  mvdir
storage/myisam/mi_dynrec.c:
  mvdir
storage/myisam/mi_extra.c:
  mvdir
storage/myisam/mi_info.c:
  mvdir
storage/myisam/mi_key.c:
  mvdir
storage/myisam/mi_keycache.c:
  mvdir
storage/myisam/mi_locking.c:
  mvdir
storage/myisam/mi_log.c:
  mvdir
storage/myisam/mi_open.c:
  mvdir
storage/myisam/mi_packrec.c:
  mvdir
storage/myisam/mi_page.c:
  mvdir
storage/myisam/mi_panic.c:
  mvdir
storage/myisam/mi_preload.c:
  mvdir
storage/myisam/mi_range.c:
  mvdir
storage/myisam/mi_rename.c:
  mvdir
storage/myisam/mi_rfirst.c:
  mvdir
storage/myisam/mi_rkey.c:
  mvdir
storage/myisam/mi_rlast.c:
  mvdir
storage/myisam/mi_rnext.c:
  mvdir
storage/myisam/mi_rnext_same.c:
  mvdir
storage/myisam/mi_rprev.c:
  mvdir
storage/myisam/mi_rrnd.c:
  mvdir
storage/myisam/mi_rsame.c:
  mvdir
storage/myisam/ftbench/Ecompare.pl:
  mvdir
storage/myisam/ftbench/Ecreate.pl:
  mvdir
storage/myisam/ftbench/Ereport.pl:
  mvdir
storage/myisam/ftbench/README:
  mvdir
storage/myisam/ftbench/ft-test-run.sh:
  mvdir
storage/myisam/mi_rsamepos.c:
  mvdir
storage/myisam/mi_scan.c:
  mvdir
storage/myisam/mi_search.c:
  mvdir
storage/myisam/mi_static.c:
  mvdir
storage/myisam/mi_statrec.c:
  mvdir
storage/myisam/mi_test1.c:
  mvdir
storage/myisam/mi_test2.c:
  mvdir
storage/myisam/mi_test3.c:
  mvdir
storage/myisam/mi_test_all.res:
  mvdir
storage/myisam/mi_test_all.sh:
  mvdir
storage/myisam/mi_unique.c:
  mvdir
storage/myisam/mi_update.c:
  mvdir
storage/myisam/mi_write.c:
  mvdir
storage/myisam/myisam_ftdump.c:
  mvdir
storage/myisam/myisamchk.c:
  mvdir
storage/myisam/myisamdef.h:
  mvdir
storage/myisam/myisamlog.c:
  mvdir
storage/myisam/myisampack.c:
  mvdir
storage/myisam/rt_index.c:
  mvdir
storage/myisam/rt_index.h:
  mvdir
storage/myisam/rt_key.c:
  mvdir
storage/myisam/rt_key.h:
  mvdir
storage/myisam/rt_mbr.c:
  mvdir
storage/myisam/rt_mbr.h:
  mvdir
storage/myisam/rt_split.c:
  mvdir
storage/myisam/rt_test.c:
  mvdir
storage/myisam/sort.c:
  mvdir
storage/myisam/sp_defs.h:
  mvdir
storage/myisam/sp_key.c:
  mvdir
storage/myisam/sp_test.c:
  mvdir
storage/myisam/test_pack:
  mvdir
storage/myisammrg/.cvsignore:
  mvdir
storage/myisammrg/Makefile.am:
  mvdir
storage/myisammrg/make-ccc:
  mvdir
storage/myisammrg/myrg_close.c:
  mvdir
storage/myisammrg/myrg_create.c:
  mvdir
storage/myisammrg/myrg_def.h:
  mvdir
storage/myisammrg/myrg_delete.c:
  mvdir
storage/myisammrg/myrg_extra.c:
  mvdir
storage/myisammrg/myrg_info.c:
  mvdir
storage/myisammrg/myrg_locking.c:
  mvdir
storage/myisammrg/myrg_open.c:
  mvdir
storage/myisammrg/myrg_panic.c:
  mvdir
storage/myisammrg/myrg_queue.c:
  mvdir
storage/myisammrg/myrg_range.c:
  mvdir
storage/myisammrg/myrg_rfirst.c:
  mvdir
storage/myisammrg/myrg_rkey.c:
  mvdir
storage/myisammrg/myrg_rlast.c:
  mvdir
storage/myisammrg/myrg_rnext.c:
  mvdir
storage/myisammrg/myrg_rnext_same.c:
  mvdir
storage/myisammrg/myrg_rprev.c:
  mvdir
storage/myisammrg/myrg_rrnd.c:
  mvdir
storage/myisammrg/myrg_rsame.c:
  mvdir
storage/myisammrg/myrg_static.c:
  mvdir
storage/myisammrg/myrg_update.c:
  mvdir
storage/myisammrg/myrg_write.c:
  mvdir
storage/innobase/Makefile.am:
  mvdir
storage/innobase/btr/Makefile.am:
  mvdir
storage/innobase/btr/btr0btr.c:
  mvdir
storage/innobase/btr/btr0cur.c:
  mvdir
storage/innobase/btr/btr0pcur.c:
  mvdir
storage/innobase/btr/btr0sea.c:
  mvdir
storage/innobase/btr/makefilewin:
  mvdir
storage/innobase/buf/Makefile.am:
  mvdir
storage/innobase/buf/buf0buf.c:
  mvdir
storage/innobase/buf/buf0flu.c:
  mvdir
storage/innobase/buf/buf0lru.c:
  mvdir
storage/innobase/buf/buf0rea.c:
  mvdir
storage/innobase/buf/makefilewin:
  mvdir
storage/innobase/configure.in:
  mvdir
storage/innobase/data/Makefile.am:
  mvdir
storage/innobase/data/data0data.c:
  mvdir
storage/innobase/data/data0type.c:
  mvdir
storage/innobase/data/makefilewin:
  mvdir
storage/innobase/db/db0err.h:
  mvdir
storage/innobase/dict/Makefile.am:
  mvdir
storage/innobase/dict/dict0boot.c:
  mvdir
storage/innobase/dict/dict0crea.c:
  mvdir
storage/innobase/dict/dict0dict.c:
  mvdir
storage/innobase/dict/dict0load.c:
  mvdir
storage/innobase/makefilewin:
  mvdir
storage/innobase/my_cnf:
  mvdir
storage/innobase/dict/dict0mem.c:
  mvdir
storage/innobase/dict/makefilewin:
  mvdir
storage/innobase/dyn/Makefile.am:
  mvdir
storage/innobase/dyn/dyn0dyn.c:
  mvdir
storage/innobase/dyn/makefilewin:
  mvdir
storage/innobase/eval/Makefile.am:
  mvdir
storage/innobase/eval/eval0eval.c:
  mvdir
storage/innobase/eval/eval0proc.c:
  mvdir
storage/innobase/eval/makefilewin:
  mvdir
storage/innobase/fil/Makefile.am:
  mvdir
storage/innobase/fil/fil0fil.c:
  mvdir
storage/innobase/fil/makefilewin:
  mvdir
storage/innobase/fsp/Makefile.am:
  mvdir
storage/innobase/fsp/fsp0fsp.c:
  mvdir
storage/innobase/fsp/makefilewin:
  mvdir
storage/innobase/fut/Makefile.am:
  mvdir
storage/innobase/fut/fut0fut.c:
  mvdir
storage/innobase/fut/fut0lst.c:
  mvdir
storage/innobase/fut/makefilewin:
  mvdir
storage/innobase/ha/Makefile.am:
  mvdir
storage/innobase/ha/ha0ha.c:
  mvdir
storage/innobase/ha/hash0hash.c:
  mvdir
storage/innobase/ha/makefilewin:
  mvdir
storage/innobase/ibuf/Makefile.am:
  mvdir
storage/innobase/ibuf/ibuf0ibuf.c:
  mvdir
storage/innobase/ibuf/makefilewin:
  mvdir
storage/innobase/include/Makefile.am:
  mvdir
storage/innobase/include/Makefile.i:
  mvdir
storage/innobase/include/btr0btr.h:
  mvdir
storage/innobase/include/btr0btr.ic:
  mvdir
storage/innobase/include/btr0cur.h:
  mvdir
storage/innobase/include/btr0cur.ic:
  mvdir
storage/innobase/include/btr0pcur.h:
  mvdir
storage/innobase/include/btr0pcur.ic:
  mvdir
storage/innobase/include/btr0sea.h:
  mvdir
storage/innobase/include/btr0sea.ic:
  mvdir
storage/innobase/include/btr0types.h:
  mvdir
storage/innobase/include/buf0buf.h:
  mvdir
storage/innobase/include/buf0buf.ic:
  mvdir
storage/innobase/include/buf0flu.h:
  mvdir
storage/innobase/include/buf0flu.ic:
  mvdir
storage/innobase/include/buf0lru.h:
  mvdir
storage/innobase/include/buf0lru.ic:
  mvdir
storage/innobase/include/buf0rea.h:
  mvdir
storage/innobase/include/buf0types.h:
  mvdir
storage/innobase/include/data0data.h:
  mvdir
storage/innobase/include/data0data.ic:
  mvdir
storage/innobase/include/data0type.h:
  mvdir
storage/innobase/include/data0type.ic:
  mvdir
storage/innobase/include/data0types.h:
  mvdir
storage/innobase/include/db0err.h:
  mvdir
storage/innobase/include/dict0boot.h:
  mvdir
storage/innobase/include/dict0boot.ic:
  mvdir
storage/innobase/include/dict0crea.h:
  mvdir
storage/innobase/include/dict0crea.ic:
  mvdir
storage/innobase/include/dict0dict.h:
  mvdir
storage/innobase/include/dict0dict.ic:
  mvdir
storage/innobase/include/dict0load.h:
  mvdir
storage/innobase/include/dict0load.ic:
  mvdir
storage/innobase/include/dict0mem.h:
  mvdir
storage/innobase/include/dict0mem.ic:
  mvdir
storage/innobase/include/dict0types.h:
  mvdir
storage/innobase/include/dyn0dyn.h:
  mvdir
storage/innobase/include/dyn0dyn.ic:
  mvdir
storage/innobase/include/eval0eval.h:
  mvdir
storage/innobase/include/eval0eval.ic:
  mvdir
storage/innobase/include/eval0proc.h:
  mvdir
storage/innobase/include/eval0proc.ic:
  mvdir
storage/innobase/include/fil0fil.h:
  mvdir
storage/innobase/include/fsp0fsp.h:
  mvdir
storage/innobase/include/fsp0fsp.ic:
  mvdir
storage/innobase/include/fut0fut.h:
  mvdir
storage/innobase/include/fut0fut.ic:
  mvdir
storage/innobase/include/fut0lst.h:
  mvdir
storage/innobase/include/fut0lst.ic:
  mvdir
storage/innobase/include/ha0ha.h:
  mvdir
storage/innobase/include/ha0ha.ic:
  mvdir
storage/innobase/include/hash0hash.h:
  mvdir
storage/innobase/include/hash0hash.ic:
  mvdir
storage/innobase/include/ibuf0ibuf.h:
  mvdir
storage/innobase/include/ibuf0ibuf.ic:
  mvdir
storage/innobase/include/ibuf0types.h:
  mvdir
storage/innobase/include/lock0lock.h:
  mvdir
storage/innobase/include/lock0lock.ic:
  mvdir
storage/innobase/include/lock0types.h:
  mvdir
storage/innobase/include/log0log.h:
  mvdir
storage/innobase/include/log0log.ic:
  mvdir
storage/innobase/include/log0recv.h:
  mvdir
storage/innobase/include/log0recv.ic:
  mvdir
storage/innobase/include/mach0data.h:
  mvdir
storage/innobase/include/mach0data.ic:
  mvdir
storage/innobase/include/makefilewin.i:
  mvdir
storage/innobase/include/mem0dbg.h:
  mvdir
storage/innobase/include/mem0dbg.ic:
  mvdir
storage/innobase/include/mem0mem.h:
  mvdir
storage/innobase/include/mem0mem.ic:
  mvdir
storage/innobase/include/mem0pool.h:
  mvdir
storage/innobase/include/mem0pool.ic:
  mvdir
storage/innobase/include/mtr0log.h:
  mvdir
storage/innobase/include/mtr0log.ic:
  mvdir
storage/innobase/include/mtr0mtr.h:
  mvdir
storage/innobase/include/mtr0mtr.ic:
  mvdir
storage/innobase/include/mtr0types.h:
  mvdir
storage/innobase/include/os0file.h:
  mvdir
storage/innobase/include/os0proc.h:
  mvdir
storage/innobase/include/os0proc.ic:
  mvdir
storage/innobase/include/os0sync.h:
  mvdir
storage/innobase/include/os0sync.ic:
  mvdir
storage/innobase/include/os0thread.h:
  mvdir
storage/innobase/include/os0thread.ic:
  mvdir
storage/innobase/include/page0cur.h:
  mvdir
storage/innobase/include/page0cur.ic:
  mvdir
storage/innobase/include/page0page.h:
  mvdir
storage/innobase/include/page0page.ic:
  mvdir
storage/innobase/include/page0types.h:
  mvdir
storage/innobase/include/pars0grm.h:
  mvdir
storage/innobase/include/pars0opt.h:
  mvdir
storage/innobase/include/pars0opt.ic:
  mvdir
storage/innobase/include/pars0pars.h:
  mvdir
storage/innobase/include/pars0pars.ic:
  mvdir
storage/innobase/include/pars0sym.h:
  mvdir
storage/innobase/include/pars0sym.ic:
  mvdir
storage/innobase/include/pars0types.h:
  mvdir
storage/innobase/include/que0que.h:
  mvdir
storage/innobase/include/que0que.ic:
  mvdir
storage/innobase/include/que0types.h:
  mvdir
storage/innobase/include/read0read.h:
  mvdir
storage/innobase/include/read0read.ic:
  mvdir
storage/innobase/include/read0types.h:
  mvdir
storage/innobase/include/rem0cmp.h:
  mvdir
storage/innobase/include/rem0cmp.ic:
  mvdir
storage/innobase/include/rem0rec.h:
  mvdir
storage/innobase/include/rem0rec.ic:
  mvdir
storage/innobase/include/rem0types.h:
  mvdir
storage/innobase/include/row0ins.h:
  mvdir
storage/innobase/include/row0ins.ic:
  mvdir
storage/innobase/include/row0mysql.h:
  mvdir
storage/innobase/include/row0mysql.ic:
  mvdir
storage/innobase/include/row0purge.h:
  mvdir
storage/innobase/include/row0purge.ic:
  mvdir
storage/innobase/include/row0row.h:
  mvdir
storage/innobase/include/row0row.ic:
  mvdir
storage/innobase/include/row0sel.h:
  mvdir
storage/innobase/include/row0sel.ic:
  mvdir
storage/innobase/include/row0types.h:
  mvdir
storage/innobase/include/row0uins.h:
  mvdir
storage/innobase/include/row0uins.ic:
  mvdir
storage/innobase/include/row0umod.h:
  mvdir
storage/innobase/include/row0umod.ic:
  mvdir
storage/innobase/include/row0undo.h:
  mvdir
storage/innobase/include/row0undo.ic:
  mvdir
storage/innobase/include/row0upd.h:
  mvdir
storage/innobase/include/row0upd.ic:
  mvdir
storage/innobase/include/row0vers.h:
  mvdir
storage/innobase/include/row0vers.ic:
  mvdir
storage/innobase/include/srv0que.h:
  mvdir
storage/innobase/include/srv0srv.h:
  mvdir
storage/innobase/include/srv0srv.ic:
  mvdir
storage/innobase/include/srv0start.h:
  mvdir
storage/innobase/include/sync0arr.h:
  mvdir
storage/innobase/include/sync0arr.ic:
  mvdir
storage/innobase/include/sync0rw.h:
  mvdir
storage/innobase/include/sync0rw.ic:
  mvdir
storage/innobase/include/sync0sync.h:
  mvdir
storage/innobase/include/sync0sync.ic:
  mvdir
storage/innobase/include/sync0types.h:
  mvdir
storage/innobase/include/thr0loc.h:
  mvdir
storage/innobase/include/thr0loc.ic:
  mvdir
storage/innobase/include/trx0purge.h:
  mvdir
storage/innobase/include/trx0purge.ic:
  mvdir
storage/innobase/include/trx0rec.h:
  mvdir
storage/innobase/include/trx0rec.ic:
  mvdir
storage/innobase/include/trx0roll.h:
  mvdir
storage/innobase/include/trx0roll.ic:
  mvdir
storage/innobase/include/trx0rseg.h:
  mvdir
storage/innobase/include/trx0rseg.ic:
  mvdir
storage/innobase/include/trx0sys.h:
  mvdir
storage/innobase/include/trx0sys.ic:
  mvdir
storage/innobase/include/trx0trx.h:
  mvdir
storage/innobase/include/trx0trx.ic:
  mvdir
storage/innobase/include/trx0types.h:
  mvdir
storage/innobase/include/trx0undo.h:
  mvdir
storage/innobase/include/trx0undo.ic:
  mvdir
storage/innobase/include/trx0xa.h:
  mvdir
storage/innobase/include/univ.i:
  mvdir
storage/innobase/include/usr0sess.h:
  mvdir
storage/innobase/include/usr0sess.ic:
  mvdir
storage/innobase/include/usr0types.h:
  mvdir
storage/innobase/include/ut0byte.h:
  mvdir
storage/innobase/include/ut0byte.ic:
  mvdir
storage/innobase/include/ut0dbg.h:
  mvdir
storage/innobase/include/ut0lst.h:
  mvdir
storage/innobase/include/ut0mem.h:
  mvdir
storage/innobase/include/ut0mem.ic:
  mvdir
storage/innobase/include/ut0rnd.h:
  mvdir
storage/innobase/include/ut0rnd.ic:
  mvdir
storage/innobase/include/ut0sort.h:
  mvdir
storage/innobase/include/ut0ut.h:
  mvdir
storage/innobase/include/ut0ut.ic:
  mvdir
storage/innobase/lock/Makefile.am:
  mvdir
storage/innobase/lock/lock0lock.c:
  mvdir
storage/innobase/lock/makefilewin:
  mvdir
storage/innobase/log/Makefile.am:
  mvdir
storage/innobase/log/log0log.c:
  mvdir
storage/innobase/log/log0recv.c:
  mvdir
storage/innobase/log/makefilewin:
  mvdir
storage/innobase/mach/Makefile.am:
  mvdir
storage/innobase/mach/mach0data.c:
  mvdir
storage/innobase/mach/makefilewin:
  mvdir
storage/innobase/mem/Makefile.am:
  mvdir
storage/innobase/mem/makefilewin:
  mvdir
storage/innobase/mem/mem0dbg.c:
  mvdir
storage/innobase/mem/mem0mem.c:
  mvdir
storage/innobase/mem/mem0pool.c:
  mvdir
storage/innobase/mtr/Makefile.am:
  mvdir
storage/innobase/mtr/makefilewin:
  mvdir
storage/innobase/mtr/mtr0log.c:
  mvdir
storage/innobase/mtr/mtr0mtr.c:
  mvdir
storage/innobase/os/Makefile.am:
  mvdir
storage/innobase/os/makefilewin:
  mvdir
storage/innobase/os/os0file.c:
  mvdir
storage/innobase/os/os0proc.c:
  mvdir
storage/innobase/os/os0sync.c:
  mvdir
storage/innobase/os/os0thread.c:
  mvdir
storage/innobase/page/Makefile.am:
  mvdir
storage/innobase/page/makefilewin:
  mvdir
storage/innobase/page/page0cur.c:
  mvdir
storage/innobase/page/page0page.c:
  mvdir
storage/innobase/pars/Makefile.am:
  mvdir
storage/innobase/pars/lexyy.c:
  mvdir
storage/innobase/pars/makefilewin:
  mvdir
storage/innobase/pars/pars0grm.c:
  mvdir
storage/innobase/pars/pars0grm.h:
  mvdir
storage/innobase/pars/pars0grm.y:
  mvdir
storage/innobase/pars/pars0lex.l:
  mvdir
storage/innobase/pars/pars0opt.c:
  mvdir
storage/innobase/pars/pars0pars.c:
  mvdir
storage/innobase/pars/pars0sym.c:
  mvdir
storage/innobase/que/Makefile.am:
  mvdir
storage/innobase/que/makefilewin:
  mvdir
storage/innobase/que/que0que.c:
  mvdir
storage/innobase/read/Makefile.am:
  mvdir
storage/innobase/read/makefilewin:
  mvdir
storage/innobase/read/read0read.c:
  mvdir
storage/innobase/rem/Makefile.am:
  mvdir
storage/innobase/rem/makefilewin:
  mvdir
storage/innobase/rem/rem0cmp.c:
  mvdir
storage/innobase/rem/rem0rec.c:
  mvdir
storage/innobase/row/Makefile.am:
  mvdir
storage/innobase/row/makefilewin:
  mvdir
storage/innobase/row/row0ins.c:
  mvdir
storage/innobase/row/row0mysql.c:
  mvdir
storage/innobase/row/row0purge.c:
  mvdir
storage/innobase/row/row0row.c:
  mvdir
storage/innobase/row/row0sel.c:
  mvdir
storage/innobase/row/row0uins.c:
  mvdir
storage/innobase/row/row0umod.c:
  mvdir
storage/innobase/row/row0undo.c:
  mvdir
storage/innobase/row/row0upd.c:
  mvdir
storage/innobase/row/row0vers.c:
  mvdir
storage/innobase/srv/Makefile.am:
  mvdir
storage/innobase/srv/makefilewin:
  mvdir
storage/innobase/srv/srv0que.c:
  mvdir
storage/innobase/srv/srv0srv.c:
  mvdir
storage/innobase/srv/srv0start.c:
  mvdir
storage/innobase/sync/Makefile.am:
  mvdir
storage/innobase/sync/makefilewin:
  mvdir
storage/innobase/sync/sync0arr.c:
  mvdir
storage/innobase/sync/sync0rw.c:
  mvdir
storage/innobase/sync/sync0sync.c:
  mvdir
storage/innobase/thr/Makefile.am:
  mvdir
storage/innobase/thr/makefilewin:
  mvdir
storage/innobase/thr/thr0loc.c:
  mvdir
storage/innobase/trx/Makefile.am:
  mvdir
storage/innobase/trx/makefilewin:
  mvdir
storage/innobase/trx/trx0purge.c:
  mvdir
storage/innobase/trx/trx0rec.c:
  mvdir
storage/innobase/trx/trx0roll.c:
  mvdir
storage/innobase/trx/trx0rseg.c:
  mvdir
storage/innobase/trx/trx0sys.c:
  mvdir
storage/innobase/trx/trx0trx.c:
  mvdir
storage/innobase/trx/trx0undo.c:
  mvdir
storage/innobase/usr/Makefile.am:
  mvdir
storage/innobase/usr/makefilewin:
  mvdir
storage/innobase/usr/usr0sess.c:
  mvdir
storage/innobase/ut/Makefile.am:
  mvdir
storage/innobase/ut/makefilewin:
  mvdir
storage/innobase/ut/ut0byte.c:
  mvdir
storage/innobase/ut/ut0dbg.c:
  mvdir
storage/innobase/ut/ut0mem.c:
  mvdir
storage/innobase/ut/ut0rnd.c:
  mvdir
storage/innobase/ut/ut0ut.c:
  mvdir
storage/ndb/Makefile.am:
  mvdir
storage/ndb/bin/.empty:
  mvdir
storage/ndb/bin/check-regression.sh:
  mvdir
storage/ndb/bin/makeTestPrograms_html.sh:
  mvdir
storage/ndb/config/common.mk.am:
  mvdir
storage/ndb/config/make-win-dsw.sh:
  mvdir
storage/ndb/config/type_kernel.mk.am:
  mvdir
storage/ndb/config/type_mgmapiclient.mk.am:
  mvdir
storage/ndb/config/type_ndbapi.mk.am:
  mvdir
storage/ndb/config/type_ndbapiclient.mk.am:
  mvdir
storage/ndb/config/type_ndbapitest.mk.am:
  mvdir
storage/ndb/config/type_ndbapitools.mk.am:
  mvdir
storage/ndb/config/type_util.mk.am:
  mvdir
storage/ndb/config/win-includes:
  mvdir
storage/ndb/config/win-lib.am:
  mvdir
storage/ndb/config/win-libraries:
  mvdir
storage/ndb/config/win-name:
  mvdir
storage/ndb/config/win-prg.am:
  mvdir
storage/ndb/config/win-sources:
  mvdir
storage/ndb/demos/1-node/1-api-3/Ndb.cfg:
  mvdir
storage/ndb/demos/1-node/1-db-2/Ndb.cfg:
  mvdir
storage/ndb/demos/1-node/1-mgm-1/Ndb.cfg:
  mvdir
storage/ndb/demos/1-node/1-mgm-1/template_config.ini:
  mvdir
storage/ndb/demos/2-node/2-api-4/Ndb.cfg:
  mvdir
storage/ndb/demos/2-node/2-api-5/Ndb.cfg:
  mvdir
storage/ndb/demos/2-node/2-api-6/Ndb.cfg:
  mvdir
storage/ndb/demos/2-node/2-api-7/Ndb.cfg:
  mvdir
storage/ndb/demos/2-node/2-db-2/Ndb.cfg:
  mvdir
storage/ndb/demos/2-node/2-db-3/Ndb.cfg:
  mvdir
storage/ndb/demos/2-node/2-mgm-1/Ndb.cfg:
  mvdir
storage/ndb/demos/2-node/2-mgm-1/template_config.ini:
  mvdir
storage/ndb/demos/config-templates/config_template-1-REP.ini:
  mvdir
storage/ndb/demos/config-templates/config_template-4.ini:
  mvdir
storage/ndb/demos/config-templates/config_template-install.ini:
  mvdir
storage/ndb/demos/run_demo1-PS-SS_common.sh:
  mvdir
storage/ndb/demos/run_demo1-PS.sh:
  mvdir
storage/ndb/demos/run_demo1-SS.sh:
  mvdir
storage/ndb/demos/run_demo1.sh:
  mvdir
storage/ndb/demos/run_demo2.sh:
  mvdir
storage/ndb/docs/Makefile.am:
  mvdir
storage/ndb/docs/README:
  mvdir
storage/ndb/docs/doxygen/Doxyfile.mgmapi:
  mvdir
storage/ndb/docs/doxygen/Doxyfile.ndbapi:
  mvdir
storage/ndb/docs/doxygen/Doxyfile.ndb:
  mvdir
storage/ndb/docs/doxygen/Doxyfile.odbc:
  mvdir
storage/ndb/docs/doxygen/Doxyfile.test:
  mvdir
storage/ndb/docs/doxygen/header.mgmapi.tex:
  mvdir
storage/ndb/docs/doxygen/header.ndbapi.tex:
  mvdir
storage/ndb/docs/doxygen/postdoxy.pl:
  mvdir
storage/ndb/docs/doxygen/predoxy.pl:
  mvdir
storage/ndb/docs/wl2077.txt:
  mvdir
storage/ndb/home/bin/Linuxmkisofs:
  mvdir
storage/ndb/home/bin/Solarismkisofs:
  mvdir
storage/ndb/home/bin/cvs2cl.pl:
  mvdir
storage/ndb/home/bin/fix-cvs-root:
  mvdir
storage/ndb/home/bin/import-from-bk.sh:
  mvdir
storage/ndb/home/bin/ndb_deploy:
  mvdir
storage/ndb/home/bin/ndbdoxy.pl:
  mvdir
storage/ndb/home/bin/ngcalc:
  mvdir
storage/ndb/home/bin/parseConfigFile.awk:
  mvdir
storage/ndb/home/bin/setup-test.sh:
  mvdir
storage/ndb/home/bin/signallog2html.lib/signallog2list.awk:
  mvdir
storage/ndb/home/bin/signallog2html.lib/uniq_blocks.awk:
  mvdir
storage/ndb/home/bin/signallog2html.sh:
  mvdir
storage/ndb/home/bin/stripcr:
  mvdir
storage/ndb/home/lib/funcs.sh:
  mvdir
storage/ndb/include/Makefile.am:
  mvdir
storage/ndb/include/debugger/DebuggerNames.hpp:
  mvdir
storage/ndb/include/debugger/EventLogger.hpp:
  mvdir
storage/ndb/include/debugger/GrepError.hpp:
  mvdir
storage/ndb/include/debugger/SignalLoggerManager.hpp:
  mvdir
storage/ndb/include/editline/editline.h:
  mvdir
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  mvdir
storage/ndb/include/kernel/AttributeHeader.hpp:
  mvdir
storage/ndb/include/kernel/AttributeList.hpp:
  mvdir
storage/ndb/include/kernel/BlockNumbers.h:
  mvdir
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  mvdir
storage/ndb/include/kernel/GrepEvent.hpp:
  mvdir
storage/ndb/include/kernel/Interpreter.hpp:
  mvdir
storage/ndb/include/kernel/LogLevel.hpp:
  mvdir
storage/ndb/include/kernel/NodeBitmask.hpp:
  mvdir
storage/ndb/include/kernel/NodeInfo.hpp:
  mvdir
storage/ndb/include/kernel/NodeState.hpp:
  mvdir
storage/ndb/include/kernel/RefConvert.hpp:
  mvdir
storage/ndb/include/kernel/kernel_config_parameters.h:
  mvdir
storage/ndb/include/kernel/kernel_types.h:
  mvdir
storage/ndb/include/kernel/ndb_limits.h:
  mvdir
storage/ndb/include/kernel/signaldata/AbortAll.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/AccFrag.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/AccLock.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/AccScan.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/AlterIndx.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/AlterTab.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/AlterTrig.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ApiVersion.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/AttrInfo.hpp:
  mvdir
storage/ndb/include/kernel/trigger_definitions.h:
  mvdir
storage/ndb/include/ndb_constants.h:
  mvdir
storage/ndb/include/ndb_global.h.in:
  mvdir
storage/ndb/include/ndb_init.h:
  mvdir
storage/ndb/include/ndb_net.h:
  mvdir
storage/ndb/include/ndb_types.h.in:
  mvdir
storage/ndb/include/ndb_version.h.in:
  mvdir
storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/BuildIndx.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CmInit.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CntrStart.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ConfigParamId.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CopyActive.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CopyFrag.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CreateEvnt.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CreateFrag.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CreateTab.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CreateTable.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/CreateTrig.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DiAddTab.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DiGetNodes.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DictStart.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DihAddFrag.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DihContinueB.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DihStartTab.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DisconnectRep.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DropIndx.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DropTab.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DropTabFile.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DropTable.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DropTrig.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/EmptyLcp.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/EndTo.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/EventReport.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ExecFragReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/FailRep.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/FsAppendReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/FsCloseReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/FsConf.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/FsRef.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/GCPSave.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/GetTabInfo.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/GetTableId.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/GrepImpl.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/HotSpareRep.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/KeyInfo.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/LCP.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ListTables.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/LqhKey.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/LqhTransConf.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ManagementServer.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/MasterGCP.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/MasterLCP.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/NdbSttor.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/NextScan.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/NodeFailRep.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/PackedSignal.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/PrepDropTab.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ReadConfig.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/RelTabMem.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/RepImpl.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ResumeReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ScanFrag.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/ScanTab.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/SetVarReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/SignalData.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/SrFragidConf.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/StartFragReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/StartInfo.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/StartMe.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/StartOrd.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/StartPerm.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/StartRec.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/StartTo.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/StopMe.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/StopPerm.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/StopReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/SystemError.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TamperOrd.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TcCommit.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TcContinueB.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TcHbRep.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TcIndx.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TcKeyConf.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TcKeyRef.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TestOrd.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TransIdAI.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TupCommit.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TupFrag.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TupKey.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TuxBound.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TuxContinueB.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TuxMaint.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/UpdateTo.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/UtilDelete.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/UtilExecute.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/UtilLock.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/UtilPrepare.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/UtilRelease.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/UtilSequence.hpp:
  mvdir
storage/ndb/include/kernel/signaldata/WaitGCP.hpp:
  mvdir
storage/ndb/include/logger/ConsoleLogHandler.hpp:
  mvdir
storage/ndb/include/logger/FileLogHandler.hpp:
  mvdir
storage/ndb/include/logger/LogHandler.hpp:
  mvdir
storage/ndb/include/logger/Logger.hpp:
  mvdir
storage/ndb/include/logger/SysLogHandler.hpp:
  mvdir
storage/ndb/include/mgmapi/mgmapi.h:
  mvdir
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  mvdir
storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h:
  mvdir
storage/ndb/include/mgmapi/mgmapi_debug.h:
  mvdir
storage/ndb/include/mgmapi/ndb_logevent.h:
  mvdir
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
  mvdir
storage/ndb/include/mgmcommon/IPCConfig.hpp:
  mvdir
storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp:
  mvdir
storage/ndb/include/ndbapi/Ndb.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbApi.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbBlob.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbError.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbOperation.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbPool.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbReceiver.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbScanFilter.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  mvdir
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  mvdir
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  mvdir
storage/ndb/include/ndbapi/ndb_opt_defaults.h:
  mvdir
storage/ndb/include/ndbapi/ndbapi_limits.h:
  mvdir
storage/ndb/include/ndbapi/ndberror.h:
  mvdir
storage/ndb/include/newtonapi/dba.h:
  mvdir
storage/ndb/include/newtonapi/defs/pcn_types.h:
  mvdir
storage/ndb/include/portlib/NdbCondition.h:
  mvdir
storage/ndb/include/portlib/NdbConfig.h:
  mvdir
storage/ndb/include/portlib/NdbDaemon.h:
  mvdir
storage/ndb/include/portlib/NdbEnv.h:
  mvdir
storage/ndb/include/portlib/NdbHost.h:
  mvdir
storage/ndb/include/portlib/NdbMain.h:
  mvdir
storage/ndb/include/portlib/NdbMem.h:
  mvdir
storage/ndb/include/portlib/NdbMutex.h:
  mvdir
storage/ndb/include/portlib/NdbSleep.h:
  mvdir
storage/ndb/include/portlib/NdbTCP.h:
  mvdir
storage/ndb/include/portlib/NdbThread.h:
  mvdir
storage/ndb/include/portlib/NdbTick.h:
  mvdir
storage/ndb/include/portlib/PortDefs.h:
  mvdir
storage/ndb/include/portlib/prefetch.h:
  mvdir
storage/ndb/include/transporter/TransporterCallback.hpp:
  mvdir
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  mvdir
storage/ndb/include/transporter/TransporterRegistry.hpp:
  mvdir
storage/ndb/include/util/Base64.hpp:
  mvdir
storage/ndb/include/util/BaseString.hpp:
  mvdir
storage/ndb/include/util/Bitmask.hpp:
  mvdir
storage/ndb/include/util/ConfigValues.hpp:
  mvdir
storage/ndb/include/util/File.hpp:
  mvdir
storage/ndb/include/util/InputStream.hpp:
  mvdir
storage/ndb/include/util/NdbAutoPtr.hpp:
  mvdir
storage/ndb/include/util/NdbOut.hpp:
  mvdir
storage/ndb/include/util/NdbSqlUtil.hpp:
  mvdir
storage/ndb/include/util/OutputStream.hpp:
  mvdir
storage/ndb/include/util/Parser.hpp:
  mvdir
storage/ndb/include/util/Properties.hpp:
  mvdir
storage/ndb/include/util/SimpleProperties.hpp:
  mvdir
storage/ndb/include/util/SocketAuthenticator.hpp:
  mvdir
storage/ndb/include/util/SocketClient.hpp:
  mvdir
storage/ndb/include/util/SocketServer.hpp:
  mvdir
storage/ndb/include/util/UtilBuffer.hpp:
  mvdir
storage/ndb/include/util/Vector.hpp:
  mvdir
storage/ndb/include/util/basestring_vsnprintf.h:
  mvdir
storage/ndb/include/util/md5_hash.hpp:
  mvdir
storage/ndb/include/util/ndb_opts.h:
  mvdir
storage/ndb/include/util/random.h:
  mvdir
storage/ndb/include/util/socket_io.h:
  mvdir
storage/ndb/include/util/uucode.h:
  mvdir
storage/ndb/include/util/version.h:
  mvdir
storage/ndb/lib/.empty:
  mvdir
storage/ndb/ndbapi-examples/Makefile:
  mvdir
storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile:
  mvdir
storage/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_async_example/readme.txt:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile:
  mvdir
storage/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp:
  mvdir
storage/ndb/src/Makefile.am:
  mvdir
storage/ndb/src/common/Makefile.am:
  mvdir
storage/ndb/src/common/debugger/BlockNames.cpp:
  mvdir
storage/ndb/src/common/debugger/DebuggerNames.cpp:
  mvdir
storage/ndb/src/common/debugger/EventLogger.cpp:
  mvdir
storage/ndb/src/common/debugger/GrepError.cpp:
  mvdir
storage/ndb/src/common/debugger/Makefile.am:
  mvdir
storage/ndb/src/common/debugger/SignalLoggerManager.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/AccLock.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/AlterTab.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/AlterTable.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/CntrStart.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/ContinueB.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/DropIndx.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/DropTab.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/DropTrig.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/FailRep.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/FsConf.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/FsRef.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/GCPSave.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/LCP.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/LqhKey.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/Makefile.am:
  mvdir
storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/StartRec.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/SystemError.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/TcIndx.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/TupCommit.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/TupKey.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/UtilLock.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp:
  mvdir
storage/ndb/src/common/debugger/signaldata/print.awk:
  mvdir
storage/ndb/src/common/logger/ConsoleLogHandler.cpp:
  mvdir
storage/ndb/src/common/logger/FileLogHandler.cpp:
  mvdir
storage/ndb/src/common/logger/LogHandler.cpp:
  mvdir
storage/ndb/src/common/logger/LogHandlerList.cpp:
  mvdir
storage/ndb/src/common/logger/LogHandlerList.hpp:
  mvdir
storage/ndb/src/common/logger/Logger.cpp:
  mvdir
storage/ndb/src/common/logger/Makefile.am:
  mvdir
storage/ndb/src/common/logger/SysLogHandler.cpp:
  mvdir
storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp:
  mvdir
storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp:
  mvdir
storage/ndb/src/common/logger/listtest/Makefile:
  mvdir
storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp:
  mvdir
storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp:
  mvdir
storage/ndb/src/common/logger/loggertest/Makefile:
  mvdir
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  mvdir
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  mvdir
storage/ndb/src/common/mgmcommon/Makefile.am:
  mvdir
storage/ndb/src/common/mgmcommon/printConfig/Makefile:
  mvdir
storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp:
  mvdir
storage/ndb/src/common/portlib/Makefile.am:
  mvdir
storage/ndb/src/common/portlib/NdbCondition.c:
  mvdir
storage/ndb/src/common/portlib/NdbConfig.c:
  mvdir
storage/ndb/src/common/portlib/NdbDaemon.c:
  mvdir
storage/ndb/src/common/portlib/NdbEnv.c:
  mvdir
storage/ndb/src/common/portlib/NdbHost.c:
  mvdir
storage/ndb/src/common/portlib/NdbMem.c:
  mvdir
storage/ndb/src/common/portlib/NdbMutex.c:
  mvdir
storage/ndb/src/common/portlib/NdbPortLibTest.cpp:
  mvdir
storage/ndb/src/common/portlib/NdbSleep.c:
  mvdir
storage/ndb/src/common/portlib/NdbTCP.cpp:
  mvdir
storage/ndb/src/common/portlib/NdbThread.c:
  mvdir
storage/ndb/src/common/portlib/NdbTick.c:
  mvdir
storage/ndb/src/common/portlib/gcc.cpp:
  mvdir
storage/ndb/src/common/portlib/memtest.c:
  mvdir
storage/ndb/src/common/portlib/mmslist.cpp:
  mvdir
storage/ndb/src/common/portlib/mmstest.cpp:
  mvdir
storage/ndb/src/common/portlib/munmaptest.cpp:
  mvdir
storage/ndb/src/common/portlib/old_dirs/memtest/Makefile:
  mvdir
storage/ndb/src/common/portlib/old_dirs/memtest/munmaptest/Makefile:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/Makefile:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/NdbCondition.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/NdbConditionOSE.h:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/NdbEnv.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/NdbHost.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/NdbMem.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/NdbMutex.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/NdbOut.cpp:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/NdbSleep.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/NdbTCP.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/NdbThread.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/ose/NdbTick.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/test/Makefile:
  mvdir
storage/ndb/src/common/portlib/old_dirs/win32/Makefile:
  mvdir
storage/ndb/src/common/portlib/old_dirs/win32/NdbCondition.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/win32/NdbDaemon.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/win32/NdbEnv.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/win32/NdbHost.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/win32/NdbMem.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/win32/NdbMutex.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/win32/NdbSleep.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/win32/NdbTCP.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/win32/NdbThread.c:
  mvdir
storage/ndb/src/common/portlib/old_dirs/win32/NdbTick.c:
  mvdir
storage/ndb/src/common/portlib/win32/NdbCondition.c:
  mvdir
storage/ndb/src/common/portlib/win32/NdbDaemon.c:
  mvdir
storage/ndb/src/common/portlib/win32/NdbEnv.c:
  mvdir
storage/ndb/src/common/portlib/win32/NdbHost.c:
  mvdir
storage/ndb/src/common/portlib/win32/NdbMem.c:
  mvdir
storage/ndb/src/common/portlib/win32/NdbMutex.c:
  mvdir
storage/ndb/src/common/portlib/win32/NdbSleep.c:
  mvdir
storage/ndb/src/common/portlib/win32/NdbTCP.c:
  mvdir
storage/ndb/src/common/portlib/win32/NdbThread.c:
  mvdir
storage/ndb/src/common/portlib/win32/NdbTick.c:
  mvdir
storage/ndb/src/common/transporter/Makefile.am:
  mvdir
storage/ndb/src/common/transporter/OSE_Receiver.cpp:
  mvdir
storage/ndb/src/common/transporter/OSE_Receiver.hpp:
  mvdir
storage/ndb/src/common/transporter/OSE_Signals.hpp:
  mvdir
storage/ndb/src/common/transporter/OSE_Transporter.cpp:
  mvdir
storage/ndb/src/common/transporter/OSE_Transporter.hpp:
  mvdir
storage/ndb/src/common/transporter/Packer.cpp:
  mvdir
storage/ndb/src/common/transporter/Packer.hpp:
  mvdir
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
  mvdir
storage/ndb/src/common/transporter/SCI_Transporter.hpp:
  mvdir
storage/ndb/src/common/transporter/SHM_Buffer.hpp:
  mvdir
storage/ndb/src/common/transporter/SHM_Transporter.cpp:
  mvdir
storage/ndb/src/common/transporter/SHM_Transporter.hpp:
  mvdir
storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp:
  mvdir
storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp:
  mvdir
storage/ndb/src/common/transporter/SendBuffer.cpp:
  mvdir
storage/ndb/src/common/transporter/SendBuffer.hpp:
  mvdir
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  mvdir
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  mvdir
storage/ndb/src/common/transporter/Transporter.cpp:
  mvdir
storage/ndb/src/common/transporter/Transporter.hpp:
  mvdir
storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp:
  mvdir
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  mvdir
storage/ndb/src/common/transporter/basictest/Makefile:
  mvdir
storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp:
  mvdir
storage/ndb/src/common/transporter/buddy.cpp:
  mvdir
storage/ndb/src/common/transporter/buddy.hpp:
  mvdir
storage/ndb/src/common/transporter/failoverSCI/Makefile:
  mvdir
storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp:
  mvdir
storage/ndb/src/common/transporter/perftest/Makefile:
  mvdir
storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp:
  mvdir
storage/ndb/src/common/transporter/priotest/Makefile:
  mvdir
storage/ndb/src/common/transporter/priotest/prioOSE/Makefile:
  mvdir
storage/ndb/src/common/transporter/priotest/prioSCI/Makefile:
  mvdir
storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp:
  mvdir
storage/ndb/src/common/transporter/priotest/prioSHM/Makefile:
  mvdir
storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp:
  mvdir
storage/ndb/src/common/transporter/priotest/prioTCP/Makefile:
  mvdir
storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp:
  mvdir
storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp:
  mvdir
storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp:
  mvdir
storage/ndb/src/common/util/Base64.cpp:
  mvdir
storage/ndb/src/common/util/BaseString.cpp:
  mvdir
storage/ndb/src/common/util/Bitmask.cpp:
  mvdir
storage/ndb/src/common/util/ConfigValues.cpp:
  mvdir
storage/ndb/src/common/util/File.cpp:
  mvdir
storage/ndb/src/common/util/InputStream.cpp:
  mvdir
storage/ndb/src/common/util/Makefile.am:
  mvdir
storage/ndb/src/common/util/NdbErrHnd.cpp:
  mvdir
storage/ndb/src/common/util/NdbOut.cpp:
  mvdir
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  mvdir
storage/ndb/src/common/util/OutputStream.cpp:
  mvdir
storage/ndb/src/common/util/Parser.cpp:
  mvdir
storage/ndb/src/common/util/Properties.cpp:
  mvdir
storage/ndb/src/common/util/SimpleProperties.cpp:
  mvdir
storage/ndb/src/common/util/SocketAuthenticator.cpp:
  mvdir
storage/ndb/src/common/util/SocketClient.cpp:
  mvdir
storage/ndb/src/common/util/SocketServer.cpp:
  mvdir
storage/ndb/src/common/util/basestring_vsnprintf.c:
  mvdir
storage/ndb/src/common/util/filetest/FileUnitTest.cpp:
  mvdir
storage/ndb/src/common/util/filetest/FileUnitTest.hpp:
  mvdir
storage/ndb/src/common/util/filetest/Makefile:
  mvdir
storage/ndb/src/common/util/getarg.cat3:
  mvdir
storage/ndb/src/common/util/md5_hash.cpp:
  mvdir
storage/ndb/src/common/util/ndb_init.c:
  mvdir
storage/ndb/src/common/util/new.cpp:
  mvdir
storage/ndb/src/common/util/random.c:
  mvdir
storage/ndb/src/common/util/socket_io.cpp:
  mvdir
storage/ndb/src/common/util/strdup.c:
  mvdir
storage/ndb/src/common/util/testConfigValues/Makefile:
  mvdir
storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp:
  mvdir
storage/ndb/src/common/util/uucode.c:
  mvdir
storage/ndb/src/common/util/version.c:
  mvdir
storage/ndb/src/common/util/testProperties/Makefile:
  mvdir
storage/ndb/src/common/util/testProperties/testProperties.cpp:
  mvdir
storage/ndb/src/common/util/testSimpleProperties/Makefile:
  mvdir
storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp:
  mvdir
storage/ndb/src/cw/Makefile.am:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.dsp:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.dsw:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.rc:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.sln:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.suo:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/Closed.ICO:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/Open.ICO:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/TreeView.h:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/bmp00001.bmp:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/resource.h:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/small.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/C++/toolbar.bmp:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/App.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/DATABASE.ICO:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/Database.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.csproj.user:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.csproj:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.ncb:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.sln:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/Process.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Computer.cls:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Database.cls:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Module1.bas:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/Process.cls:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/closed folder.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/computer.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/frmMain.frm:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/networking.ico:
  mvdir
storage/ndb/src/cw/cpcc-win32/vb6/open folder.ico:
  mvdir
storage/ndb/src/cw/cpcd/APIService.cpp:
  mvdir
storage/ndb/src/cw/cpcd/APIService.hpp:
  mvdir
storage/ndb/src/cw/cpcd/CPCD.cpp:
  mvdir
storage/ndb/src/cw/cpcd/CPCD.hpp:
  mvdir
storage/ndb/src/cw/cpcd/Makefile.am:
  mvdir
storage/ndb/src/cw/cpcd/Monitor.cpp:
  mvdir
storage/ndb/src/cw/cpcd/Process.cpp:
  mvdir
storage/ndb/src/cw/cpcd/common.cpp:
  mvdir
storage/ndb/src/cw/cpcd/common.hpp:
  mvdir
storage/ndb/src/cw/cpcd/main.cpp:
  mvdir
storage/ndb/src/cw/test/socketclient/Makefile:
  mvdir
storage/ndb/src/cw/test/socketclient/socketClientTest.cpp:
  mvdir
storage/ndb/src/cw/util/ClientInterface.cpp:
  mvdir
storage/ndb/src/cw/util/ClientInterface.hpp:
  mvdir
storage/ndb/src/cw/util/Makefile:
  mvdir
storage/ndb/src/cw/util/SocketRegistry.cpp:
  mvdir
storage/ndb/src/cw/util/SocketRegistry.hpp:
  mvdir
storage/ndb/src/cw/util/SocketService.cpp:
  mvdir
storage/ndb/src/cw/util/SocketService.hpp:
  mvdir
storage/ndb/src/external/WIN32.x86/sci/lib/SISCI_LIBRARY_WIN32.TXT:
  mvdir
storage/ndb/src/external/WIN32.x86/sci/lib/scilib.lib:
  mvdir
storage/ndb/src/external/WIN32.x86/sci/lib/scilib_md.lib:
  mvdir
storage/ndb/src/external/WIN32.x86/sci/lib/scilib_mt.lib:
  mvdir
storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api.lib:
  mvdir
storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api_md.lib:
  mvdir
storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api_mt.lib:
  mvdir
storage/ndb/src/kernel/Makefile.am:
  mvdir
storage/ndb/src/kernel/SimBlockList.cpp:
  mvdir
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  mvdir
storage/ndb/src/kernel/blocks/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/NodeRestart.new.txt:
  mvdir
storage/ndb/src/kernel/blocks/NodeRestart.txt:
  mvdir
storage/ndb/src/kernel/blocks/Start.txt:
  mvdir
storage/ndb/src/kernel/blocks/SystemRestart.new.txt:
  mvdir
storage/ndb/src/kernel/blocks/SystemRestart.txt:
  mvdir
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  mvdir
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  mvdir
storage/ndb/src/kernel/blocks/backup/Backup.txt:
  mvdir
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
  mvdir
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  mvdir
storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp:
  mvdir
storage/ndb/src/kernel/blocks/backup/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/backup/read.cpp:
  mvdir
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  mvdir
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  mvdir
storage/ndb/src/kernel/blocks/cmvmi/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  mvdir
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbacc/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/mutexes.hpp:
  mvdir
storage/ndb/src/kernel/blocks/new-block.tar.gz:
  mvdir
storage/ndb/src/kernel/main.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/CreateIndex.txt:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/CreateTable.new.txt:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/CreateTable.txt:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/Dbdict.txt:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/DropTable.txt:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/Event.txt:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl:
  mvdir
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  mvdir
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbdih/LCP.txt:
  mvdir
storage/ndb/src/kernel/blocks/dbdih/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp:
  mvdir
storage/ndb/src/kernel/blocks/dbdih/printSysfile/Makefile:
  mvdir
storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  mvdir
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile:
  mvdir
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  mvdir
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtc/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupLCP.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/DbtupUndoLog.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/dbtup/Notes.txt:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/Times.txt:
  mvdir
storage/ndb/src/kernel/blocks/dbtux/tuxstatus.html:
  mvdir
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  mvdir
storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp:
  mvdir
storage/ndb/src/kernel/blocks/dbutil/DbUtil.txt:
  mvdir
storage/ndb/src/kernel/blocks/dbutil/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/grep/Grep.cpp:
  mvdir
storage/ndb/src/kernel/blocks/grep/Grep.hpp:
  mvdir
storage/ndb/src/kernel/blocks/grep/GrepInit.cpp:
  mvdir
storage/ndb/src/kernel/blocks/grep/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/grep/systab_test/Makefile:
  mvdir
storage/ndb/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/Makefile:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/Makefile:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp:
  mvdir
storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp:
  mvdir
storage/ndb/src/kernel/blocks/qmgr/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  mvdir
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  mvdir
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  mvdir
storage/ndb/src/kernel/blocks/qmgr/timer.hpp:
  mvdir
storage/ndb/src/kernel/blocks/suma/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  mvdir
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  mvdir
storage/ndb/src/kernel/blocks/suma/Suma.txt:
  mvdir
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  mvdir
storage/ndb/src/kernel/blocks/trix/Makefile.am:
  mvdir
storage/ndb/src/kernel/blocks/trix/Trix.cpp:
  mvdir
storage/ndb/src/kernel/blocks/trix/Trix.hpp:
  mvdir
storage/ndb/src/kernel/error/Error.hpp:
  mvdir
storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp:
  mvdir
storage/ndb/src/kernel/error/ErrorMessages.cpp:
  mvdir
storage/ndb/src/kernel/error/ErrorMessages.hpp:
  mvdir
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  mvdir
storage/ndb/src/kernel/error/ErrorReporter.hpp:
  mvdir
storage/ndb/src/kernel/error/Makefile.am:
  mvdir
storage/ndb/src/kernel/error/TimeModule.cpp:
  mvdir
storage/ndb/src/kernel/error/TimeModule.hpp:
  mvdir
storage/ndb/src/kernel/vm/Array.hpp:
  mvdir
storage/ndb/src/kernel/vm/ArrayFifoList.hpp:
  mvdir
storage/ndb/src/kernel/vm/ArrayList.hpp:
  mvdir
storage/ndb/src/kernel/vm/ArrayPool.hpp:
  mvdir
storage/ndb/src/kernel/vm/CArray.hpp:
  mvdir
storage/ndb/src/kernel/vm/Callback.hpp:
  mvdir
storage/ndb/src/kernel/vm/ClusterConfiguration.cpp:
  mvdir
storage/ndb/src/kernel/vm/ClusterConfiguration.hpp:
  mvdir
storage/ndb/src/kernel/vm/Configuration.cpp:
  mvdir
storage/ndb/src/kernel/vm/Configuration.hpp:
  mvdir
storage/ndb/src/kernel/vm/DLFifoList.hpp:
  mvdir
storage/ndb/src/kernel/vm/DLHashTable.hpp:
  mvdir
storage/ndb/src/kernel/vm/DLHashTable2.hpp:
  mvdir
storage/ndb/src/kernel/vm/DLList.hpp:
  mvdir
storage/ndb/src/kernel/vm/DataBuffer.hpp:
  mvdir
storage/ndb/src/kernel/vm/Emulator.cpp:
  mvdir
storage/ndb/src/kernel/vm/Emulator.hpp:
  mvdir
storage/ndb/src/kernel/vm/FastScheduler.cpp:
  mvdir
storage/ndb/src/kernel/vm/FastScheduler.hpp:
  mvdir
storage/ndb/src/kernel/vm/GlobalData.hpp:
  mvdir
storage/ndb/src/kernel/vm/KeyTable.hpp:
  mvdir
storage/ndb/src/kernel/vm/KeyTable2.hpp:
  mvdir
storage/ndb/src/kernel/vm/LongSignal.hpp:
  mvdir
storage/ndb/src/kernel/vm/Makefile.am:
  mvdir
storage/ndb/src/kernel/vm/MetaData.cpp:
  mvdir
storage/ndb/src/kernel/vm/MetaData.hpp:
  mvdir
storage/ndb/src/kernel/vm/Mutex.cpp:
  mvdir
storage/ndb/src/kernel/vm/Mutex.hpp:
  mvdir
storage/ndb/src/kernel/vm/Prio.hpp:
  mvdir
storage/ndb/src/kernel/vm/RequestTracker.hpp:
  mvdir
storage/ndb/src/kernel/vm/SLList.hpp:
  mvdir
storage/ndb/src/kernel/vm/SafeCounter.cpp:
  mvdir
storage/ndb/src/kernel/vm/SafeCounter.hpp:
  mvdir
storage/ndb/src/kernel/vm/SectionReader.cpp:
  mvdir
storage/ndb/src/kernel/vm/SectionReader.hpp:
  mvdir
storage/ndb/src/kernel/vm/SignalCounter.hpp:
  mvdir
storage/ndb/src/kernel/vm/SimBlockList.hpp:
  mvdir
storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp:
  mvdir
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  mvdir
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  mvdir
storage/ndb/src/kernel/vm/ThreadConfig.cpp:
  mvdir
storage/ndb/src/kernel/vm/ThreadConfig.hpp:
  mvdir
storage/ndb/src/kernel/vm/TimeQueue.cpp:
  mvdir
storage/ndb/src/kernel/vm/TimeQueue.hpp:
  mvdir
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  mvdir
storage/ndb/src/kernel/vm/VMSignal.cpp:
  mvdir
storage/ndb/src/kernel/vm/VMSignal.hpp:
  mvdir
storage/ndb/src/kernel/vm/WaitQueue.hpp:
  mvdir
storage/ndb/src/kernel/vm/WatchDog.cpp:
  mvdir
storage/ndb/src/kernel/vm/WatchDog.hpp:
  mvdir
storage/ndb/src/kernel/vm/al_test/Makefile:
  mvdir
storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp:
  mvdir
storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp:
  mvdir
storage/ndb/src/kernel/vm/al_test/main.cpp:
  mvdir
storage/ndb/src/kernel/vm/pc.hpp:
  mvdir
storage/ndb/src/kernel/vm/testCopy/Makefile:
  mvdir
storage/ndb/src/kernel/vm/testCopy/rr.cpp:
  mvdir
storage/ndb/src/kernel/vm/testCopy/testCopy.cpp:
  mvdir
storage/ndb/src/kernel/vm/testDataBuffer/Makefile:
  mvdir
storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp:
  mvdir
storage/ndb/src/kernel/vm/testLongSig/Makefile:
  mvdir
storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp:
  mvdir
storage/ndb/src/kernel/vm/testSimplePropertiesSection/Makefile:
  mvdir
storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp:
  mvdir
storage/ndb/src/mgmapi/LocalConfig.cpp:
  mvdir
storage/ndb/src/mgmapi/LocalConfig.hpp:
  mvdir
storage/ndb/src/mgmapi/Makefile.am:
  mvdir
storage/ndb/src/mgmapi/mgmapi.cpp:
  mvdir
storage/ndb/src/mgmapi/mgmapi_configuration.cpp:
  mvdir
storage/ndb/src/mgmapi/mgmapi_configuration.hpp:
  mvdir
storage/ndb/src/mgmapi/mgmapi_internal.h:
  mvdir
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  mvdir
storage/ndb/src/mgmapi/ndb_logevent.hpp:
  mvdir
storage/ndb/src/mgmapi/test/Makefile:
  mvdir
storage/ndb/src/mgmapi/test/keso.c:
  mvdir
storage/ndb/src/mgmapi/test/mgmSrvApi.cpp:
  mvdir
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  mvdir
storage/ndb/src/mgmclient/Makefile.am:
  mvdir
storage/ndb/src/mgmclient/main.cpp:
  mvdir
storage/ndb/src/mgmclient/ndb_mgmclient.hpp:
  mvdir
storage/ndb/src/mgmclient/ndb_mgmclient.h:
  mvdir
storage/ndb/src/mgmclient/test_cpcd/Makefile:
  mvdir
storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
  mvdir
storage/ndb/src/mgmsrv/Config.cpp:
  mvdir
storage/ndb/src/mgmsrv/Config.hpp:
  mvdir
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  mvdir
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
  mvdir
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  mvdir
storage/ndb/src/mgmsrv/InitConfigFileParser.hpp:
  mvdir
storage/ndb/src/mgmsrv/Makefile.am:
  mvdir
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  mvdir
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  mvdir
storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  mvdir
storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
  mvdir
storage/ndb/src/mgmsrv/Services.cpp:
  mvdir
storage/ndb/src/mgmsrv/Services.hpp:
  mvdir
storage/ndb/src/mgmsrv/SignalQueue.cpp:
  mvdir
storage/ndb/src/mgmsrv/SignalQueue.hpp:
  mvdir
storage/ndb/src/mgmsrv/convertStrToInt.cpp:
  mvdir
storage/ndb/src/mgmsrv/convertStrToInt.hpp:
  mvdir
storage/ndb/src/mgmsrv/main.cpp:
  mvdir
storage/ndb/src/mgmsrv/mkconfig/Makefile:
  mvdir
storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp:
  mvdir
storage/ndb/src/ndbapi/API.hpp:
  mvdir
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  mvdir
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  mvdir
storage/ndb/src/ndbapi/DictCache.cpp:
  mvdir
storage/ndb/src/ndbapi/DictCache.hpp:
  mvdir
storage/ndb/src/ndbapi/Makefile.am:
  mvdir
storage/ndb/src/ndbapi/Ndb.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbApiSignal.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbApiSignal.hpp:
  mvdir
storage/ndb/src/ndbapi/NdbBlob.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbBlobImpl.hpp:
  mvdir
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  mvdir
storage/ndb/src/ndbapi/NdbErrorOut.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  mvdir
storage/ndb/src/ndbapi/NdbImpl.hpp:
  mvdir
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbLinHash.hpp:
  mvdir
storage/ndb/src/ndbapi/NdbOperation.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbOperationInt.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbOperationScan.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbPool.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbPoolImpl.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbPoolImpl.hpp:
  mvdir
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbReceiver.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbTransactionScan.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbUtil.cpp:
  mvdir
storage/ndb/src/ndbapi/NdbUtil.hpp:
  mvdir
storage/ndb/src/ndbapi/NdbWaiter.hpp:
  mvdir
storage/ndb/src/ndbapi/Ndberr.cpp:
  mvdir
storage/ndb/src/ndbapi/Ndbif.cpp:
  mvdir
storage/ndb/src/ndbapi/Ndbinit.cpp:
  mvdir
storage/ndb/src/ndbapi/Ndblist.cpp:
  mvdir
storage/ndb/src/ndbapi/ObjectMap.hpp:
  mvdir
storage/ndb/src/ndbapi/ScanOperation.txt:
  mvdir
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  mvdir
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  mvdir
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  mvdir
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  mvdir
storage/ndb/src/ndbapi/ndberror.c:
  mvdir
storage/ndb/src/ndbapi/signal-sender/Makefile:
  mvdir
storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp:
  mvdir
storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp:
  mvdir
storage/ndb/src/old_files/client/Makefile:
  mvdir
storage/ndb/src/old_files/client/odbc/Extra.mk:
  mvdir
storage/ndb/src/old_files/client/odbc/Makefile:
  mvdir
storage/ndb/src/old_files/client/odbc/NdbOdbc.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/NdbOdbc.def:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/CodeGen.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/CodeGen.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_base.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_base.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_column.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_column.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_comp_op.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_comp_op.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_create_index.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_create_index.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_create_row.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_create_row.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_create_table.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_create_table.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_data_type.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_data_type.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_ddl.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_ddl.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_delete.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_delete.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_delete_index.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_delete_index.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_dml.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_dml.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_dml_column.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_dml_column.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_dml_row.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_dml_row.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_drop_index.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_drop_index.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_drop_table.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_drop_table.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_column.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_column.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_const.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_const.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_func.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_func.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_op.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_op.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_param.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_param.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_row.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_expr_row.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_idx_column.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_idx_column.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_insert.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_insert.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_pred.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_pred.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_pred_op.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_pred_op.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_count.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_count.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_filter.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_filter.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_group.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_group.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_index.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_index.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_join.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_join.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_project.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_project.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_range.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_range.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_scan.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_scan.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_sort.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_sort.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_sys.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_query_sys.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_root.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_root.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_select.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_select.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_set_row.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_set_row.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_stmt.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_stmt.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_table.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_table.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_table_list.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_table_list.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_update.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_update.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_update_index.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_update_index.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_update_scan.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Code_update_scan.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/Makefile:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/SimpleParser.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/SimpleParser.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/AttrArea.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/AttrArea.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/CodeTree.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/CodeTree.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/ConnArea.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/ConnArea.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/Ctx.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/Ctx.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/DataField.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/DataField.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/DataRow.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/DataRow.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/DataType.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/DataType.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/DescArea.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/DescArea.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/DiagArea.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/DiagArea.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/Makefile:
  mvdir
storage/ndb/src/old_files/client/odbc/common/OdbcData.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/OdbcData.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/ResultArea.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/ResultArea.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/Sqlstate.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/Sqlstate.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/StmtArea.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/StmtArea.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/StmtInfo.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/StmtInfo.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/common.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/common/common.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/DictCatalog.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/DictCatalog.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/DictColumn.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/DictColumn.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/DictIndex.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/DictIndex.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/DictSchema.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/DictSchema.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/DictSys.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/DictSys.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/DictTable.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/DictTable.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/dictionary/Makefile:
  mvdir
storage/ndb/src/old_files/client/odbc/docs/class.fig:
  mvdir
storage/ndb/src/old_files/client/odbc/docs/descfield.pl:
  mvdir
storage/ndb/src/old_files/client/odbc/docs/diag.txt:
  mvdir
storage/ndb/src/old_files/client/odbc/docs/getinfo.pl:
  mvdir
storage/ndb/src/old_files/client/odbc/docs/gettypeinfo.pl:
  mvdir
storage/ndb/src/old_files/client/odbc/docs/handleattr.pl:
  mvdir
storage/ndb/src/old_files/client/odbc/docs/main.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/docs/ndbodbc.html:
  mvdir
storage/ndb/src/old_files/client/odbc/docs/select.fig:
  mvdir
storage/ndb/src/old_files/client/odbc/docs/systables.pl:
  mvdir
storage/ndb/src/old_files/client/odbc/docs/type.txt:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/Func.data:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/Func.pl:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/Makefile:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLAllocConnect.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLAllocEnv.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLAllocHandle.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLAllocHandleStd.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLAllocStmt.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLBindCol.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLBindParam.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLBindParameter.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLBrowseConnect.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLBulkOperations.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLCancel.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLCloseCursor.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLColAttribute.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLColAttributes.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLColumnPrivileges.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLColumns.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLConnect.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLCopyDesc.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLDataSources.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLDescribeCol.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLDescribeParam.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLDisconnect.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLDriverConnect.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLDrivers.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLEndTran.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLError.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLExecDirect.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLExecute.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLExtendedFetch.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLFetch.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLFetchScroll.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLForeignKeys.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLFreeConnect.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLFreeEnv.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLFreeHandle.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLFreeStmt.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetConnectAttr.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetConnectOption.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetCursorName.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetData.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetDescField.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetDescRec.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetDiagField.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetDiagRec.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetEnvAttr.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetFunctions.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetInfo.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetStmtAttr.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetStmtOption.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLGetTypeInfo.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLMoreResults.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLNativeSql.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLNumParams.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLNumResultCols.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLParamData.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLParamOptions.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLPrepare.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLPrimaryKeys.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLProcedureColumns.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLProcedures.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLPutData.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLRowCount.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLSetConnectAttr.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLSetConnectOption.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLSetCursorName.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLSetDescField.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLSetDescRec.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLSetEnvAttr.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLSetParam.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLSetPos.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLSetScrollOptions.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLSetStmtAttr.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLSetStmtOption.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLSpecialColumns.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLStatistics.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLTablePrivileges.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLTables.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/SQLTransact.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/driver.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/driver/driver.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_comp_op.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_create_index.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_create_table.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_delete_index.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_delete_lookup.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_delete_scan.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_drop_index.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_drop_table.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_expr_conv.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_expr_func.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_expr_op.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_insert.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_pred_op.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_query_index.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_query_lookup.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_query_range.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_query_scan.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_query_sys.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_update_index.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_update_lookup.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Exec_update_scan.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Executor.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Executor.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/executor/Makefile:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/AttrDbc.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/AttrEnv.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/AttrRoot.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/AttrStmt.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/DescSpec.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/FuncTab.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/HandleBase.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/HandleBase.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/HandleDbc.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/HandleDbc.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/HandleDesc.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/HandleDesc.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/HandleEnv.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/HandleEnv.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/HandleRoot.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/HandleRoot.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/HandleStmt.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/HandleStmt.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/InfoTab.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/Makefile:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/PoolNdb.cpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/PoolNdb.hpp:
  mvdir
storage/ndb/src/old_files/client/odbc/handles/handles.hpp:
  mvdir
storage/ndb/src/old_files/ndbbaseclient/Makefile:
  mvdir
storage/ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp:
  mvdir
storage/ndb/src/old_files/ndbclient/Makefile:
  mvdir
storage/ndb/src/old_files/ndbclient/ndbclient_dummy.cpp:
  mvdir
storage/ndb/src/old_files/newtonapi/Makefile:
  mvdir
storage/ndb/src/old_files/newtonapi/dba_binding.cpp:
  mvdir
storage/ndb/src/old_files/newtonapi/dba_bulkread.cpp:
  mvdir
storage/ndb/src/old_files/newtonapi/dba_config.cpp:
  mvdir
storage/ndb/src/old_files/newtonapi/dba_dac.cpp:
  mvdir
storage/ndb/src/old_files/newtonapi/dba_error.cpp:
  mvdir
storage/ndb/src/old_files/newtonapi/dba_init.cpp:
  mvdir
storage/ndb/src/old_files/newtonapi/dba_internal.hpp:
  mvdir
storage/ndb/src/old_files/newtonapi/dba_process.cpp:
  mvdir
storage/ndb/src/old_files/newtonapi/dba_process.hpp:
  mvdir
storage/ndb/src/old_files/newtonapi/dba_schema.cpp:
  mvdir
storage/ndb/src/old_files/rep/ExtSender.cpp:
  mvdir
storage/ndb/src/old_files/rep/ExtSender.hpp:
  mvdir
storage/ndb/src/old_files/rep/Makefile:
  mvdir
storage/ndb/src/old_files/rep/NodeConnectInfo.hpp:
  mvdir
storage/ndb/src/old_files/rep/README:
  mvdir
storage/ndb/src/old_files/rep/RepApiInterpreter.cpp:
  mvdir
storage/ndb/src/old_files/rep/RepApiInterpreter.hpp:
  mvdir
storage/ndb/src/old_files/rep/RepApiService.cpp:
  mvdir
storage/ndb/src/old_files/rep/RepApiService.hpp:
  mvdir
storage/ndb/src/old_files/rep/RepCommandInterpreter.cpp:
  mvdir
storage/ndb/src/old_files/rep/RepCommandInterpreter.hpp:
  mvdir
storage/ndb/src/old_files/rep/RepComponents.cpp:
  mvdir
storage/ndb/src/old_files/rep/RepComponents.hpp:
  mvdir
storage/ndb/src/old_files/rep/RepMain.cpp:
  mvdir
storage/ndb/src/old_files/rep/Requestor.cpp:
  mvdir
storage/ndb/src/old_files/rep/Requestor.hpp:
  mvdir
storage/ndb/src/old_files/rep/RequestorSubscriptions.cpp:
  mvdir
storage/ndb/src/old_files/rep/SignalQueue.cpp:
  mvdir
storage/ndb/src/old_files/rep/SignalQueue.hpp:
  mvdir
storage/ndb/src/old_files/rep/TODO:
  mvdir
storage/ndb/src/old_files/rep/adapters/AppNDB.cpp:
  mvdir
storage/ndb/src/old_files/rep/adapters/AppNDB.hpp:
  mvdir
storage/ndb/src/old_files/rep/adapters/ExtAPI.cpp:
  mvdir
storage/ndb/src/old_files/rep/adapters/ExtAPI.hpp:
  mvdir
storage/ndb/src/old_files/rep/adapters/ExtNDB.cpp:
  mvdir
storage/ndb/src/old_files/rep/adapters/ExtNDB.hpp:
  mvdir
storage/ndb/src/old_files/rep/adapters/Makefile:
  mvdir
storage/ndb/src/old_files/rep/adapters/TableInfoPs.hpp:
  mvdir
storage/ndb/src/old_files/rep/dbug_hack.cpp:
  mvdir
storage/ndb/src/old_files/rep/rep_version.hpp:
  mvdir
storage/ndb/src/old_files/rep/repapi/Makefile:
  mvdir
storage/ndb/src/old_files/rep/repapi/repapi.cpp:
  mvdir
storage/ndb/src/old_files/rep/repapi/repapi.h:
  mvdir
storage/ndb/src/old_files/rep/state/Channel.cpp:
  mvdir
storage/ndb/src/old_files/rep/state/Channel.hpp:
  mvdir
storage/ndb/src/old_files/rep/state/Interval.cpp:
  mvdir
storage/ndb/src/old_files/rep/state/Interval.hpp:
  mvdir
storage/ndb/src/old_files/rep/state/Makefile:
  mvdir
storage/ndb/src/old_files/rep/state/RepState.cpp:
  mvdir
storage/ndb/src/old_files/rep/state/RepState.hpp:
  mvdir
storage/ndb/src/old_files/rep/state/RepStateEvent.cpp:
  mvdir
storage/ndb/src/old_files/rep/state/RepStateRequests.cpp:
  mvdir
storage/ndb/src/old_files/rep/state/testInterval/Makefile:
  mvdir
storage/ndb/src/old_files/rep/state/testInterval/testInterval.cpp:
  mvdir
storage/ndb/src/old_files/rep/state/testRepState/Makefile:
  mvdir
storage/ndb/src/old_files/rep/state/testRepState/testRequestor.cpp:
  mvdir
storage/ndb/src/old_files/rep/state/testRepState/testRequestor.hpp:
  mvdir
storage/ndb/src/old_files/rep/storage/GCIBuffer.cpp:
  mvdir
storage/ndb/src/old_files/rep/storage/GCIBuffer.hpp:
  mvdir
storage/ndb/src/old_files/rep/storage/GCIContainer.cpp:
  mvdir
storage/ndb/src/old_files/rep/storage/GCIContainer.hpp:
  mvdir
storage/ndb/src/old_files/rep/storage/GCIContainerPS.cpp:
  mvdir
storage/ndb/src/old_files/rep/storage/GCIContainerPS.hpp:
  mvdir
storage/ndb/src/old_files/rep/storage/GCIPage.cpp:
  mvdir
storage/ndb/src/old_files/rep/storage/GCIPage.hpp:
  mvdir
storage/ndb/src/old_files/rep/storage/LogRecord.hpp:
  mvdir
storage/ndb/src/old_files/rep/storage/Makefile:
  mvdir
storage/ndb/src/old_files/rep/storage/NodeConnectInfo.hpp:
  mvdir
storage/ndb/src/old_files/rep/storage/NodeGroup.cpp:
  mvdir
storage/ndb/src/old_files/rep/storage/NodeGroup.hpp:
  mvdir
storage/ndb/src/old_files/rep/storage/NodeGroupInfo.cpp:
  mvdir
storage/ndb/src/old_files/rep/storage/NodeGroupInfo.hpp:
  mvdir
storage/ndb/src/old_files/rep/transfer/Makefile:
  mvdir
storage/ndb/src/old_files/rep/transfer/TransPS.cpp:
  mvdir
storage/ndb/src/old_files/rep/transfer/TransPS.hpp:
  mvdir
storage/ndb/src/old_files/rep/transfer/TransSS.cpp:
  mvdir
storage/ndb/src/old_files/rep/transfer/TransSS.hpp:
  mvdir
storage/ndb/src/old_files/rep/transfer/TransSSSubscriptions.cpp:
  mvdir
storage/ndb/test/Makefile.am:
  mvdir
storage/ndb/test/include/CpcClient.hpp:
  mvdir
storage/ndb/test/include/HugoAsynchTransactions.hpp:
  mvdir
storage/ndb/test/include/HugoCalculator.hpp:
  mvdir
storage/ndb/test/include/HugoOperations.hpp:
  mvdir
storage/ndb/test/include/HugoTransactions.hpp:
  mvdir
storage/ndb/test/include/NDBT.hpp:
  mvdir
storage/ndb/test/include/NDBT_DataSet.hpp:
  mvdir
storage/ndb/test/include/NDBT_DataSetTransaction.hpp:
  mvdir
storage/ndb/test/include/NDBT_Error.hpp:
  mvdir
storage/ndb/test/include/NDBT_Output.hpp:
  mvdir
storage/ndb/test/include/NDBT_ResultRow.hpp:
  mvdir
storage/ndb/test/include/NDBT_ReturnCodes.h:
  mvdir
storage/ndb/test/include/NDBT_Stats.hpp:
  mvdir
storage/ndb/test/include/NDBT_Table.hpp:
  mvdir
storage/ndb/test/include/NDBT_Tables.hpp:
  mvdir
storage/ndb/test/include/NDBT_Test.hpp:
  mvdir
storage/ndb/test/include/NdbBackup.hpp:
  mvdir
storage/ndb/test/include/NdbConfig.hpp:
  mvdir
storage/ndb/test/include/NdbGrep.hpp:
  mvdir
storage/ndb/test/include/NdbRestarter.hpp:
  mvdir
storage/ndb/test/include/NdbRestarts.hpp:
  mvdir
storage/ndb/test/include/NdbSchemaCon.hpp:
  mvdir
storage/ndb/test/include/NdbSchemaOp.hpp:
  mvdir
storage/ndb/test/include/NdbTest.hpp:
  mvdir
storage/ndb/test/include/NdbTimer.hpp:
  mvdir
storage/ndb/test/include/TestNdbEventOperation.hpp:
  mvdir
storage/ndb/test/include/UtilTransactions.hpp:
  mvdir
storage/ndb/test/include/getarg.h:
  mvdir
storage/ndb/test/ndbapi/InsertRecs.cpp:
  mvdir
storage/ndb/test/ndbapi/Makefile.am:
  mvdir
storage/ndb/test/ndbapi/ScanFilter.hpp:
  mvdir
storage/ndb/test/ndbapi/ScanFunctions.hpp:
  mvdir
storage/ndb/test/ndbapi/ScanInterpretTest.hpp:
  mvdir
storage/ndb/test/ndbapi/TraceNdbApi.cpp:
  mvdir
storage/ndb/test/ndbapi/VerifyNdbApi.cpp:
  mvdir
storage/ndb/test/ndbapi/acid.cpp:
  mvdir
storage/ndb/test/ndbapi/acid2.cpp:
  mvdir
storage/ndb/test/ndbapi/adoInsertRecs.cpp:
  mvdir
storage/ndb/test/ndbapi/asyncGenerator.cpp:
  mvdir
storage/ndb/test/ndbapi/benchronja.cpp:
  mvdir
storage/ndb/test/ndbapi/bulk_copy.cpp:
  mvdir
storage/ndb/test/ndbapi/cdrserver.cpp:
  mvdir
storage/ndb/test/ndbapi/celloDb.cpp:
  mvdir
storage/ndb/test/ndbapi/create_all_tabs.cpp:
  mvdir
storage/ndb/test/ndbapi/create_tab.cpp:
  mvdir
storage/ndb/test/ndbapi/drop_all_tabs.cpp:
  mvdir
storage/ndb/test/ndbapi/flexAsynch.cpp:
  mvdir
storage/ndb/test/ndbapi/flexBench.cpp:
  mvdir
storage/ndb/test/ndbapi/flexHammer.cpp:
  mvdir
storage/ndb/test/ndbapi/flexScan.cpp:
  mvdir
storage/ndb/test/ndbapi/flexTT.cpp:
  mvdir
storage/ndb/test/ndbapi/flexTimedAsynch.cpp:
  mvdir
storage/ndb/test/ndbapi/flex_bench_mysql.cpp:
  mvdir
storage/ndb/test/ndbapi/index.cpp:
  mvdir
storage/ndb/test/ndbapi/index2.cpp:
  mvdir
storage/ndb/test/ndbapi/initronja.cpp:
  mvdir
storage/ndb/test/ndbapi/interpreterInTup.cpp:
  mvdir
storage/ndb/test/ndbapi/mainAsyncGenerator.cpp:
  mvdir
storage/ndb/test/ndbapi/msa.cpp:
  mvdir
storage/ndb/test/ndbapi/ndb_async1.cpp:
  mvdir
storage/ndb/test/ndbapi/ndb_async2.cpp:
  mvdir
storage/ndb/test/ndbapi/ndb_user_populate.cpp:
  mvdir
storage/ndb/test/ndbapi/ndb_user_transaction.cpp:
  mvdir
storage/ndb/test/ndbapi/ndb_user_transaction2.cpp:
  mvdir
storage/ndb/test/ndbapi/ndb_user_transaction3.cpp:
  mvdir
storage/ndb/test/ndbapi/ndb_user_transaction4.cpp:
  mvdir
storage/ndb/test/ndbapi/ndb_user_transaction5.cpp:
  mvdir
storage/ndb/test/ndbapi/ndb_user_transaction6.cpp:
  mvdir
storage/ndb/test/ndbapi/restarter.cpp:
  mvdir
storage/ndb/test/ndbapi/restarter2.cpp:
  mvdir
storage/ndb/test/ndbapi/restarts.cpp:
  mvdir
storage/ndb/test/ndbapi/size.cpp:
  mvdir
storage/ndb/test/ndbapi/slow_select.cpp:
  mvdir
storage/ndb/test/ndbapi/testBackup.cpp:
  mvdir
storage/ndb/test/ndbapi/testBasic.cpp:
  mvdir
storage/ndb/test/ndbapi/testBasicAsynch.cpp:
  mvdir
storage/ndb/test/ndbapi/testBitfield.cpp:
  mvdir
storage/ndb/test/ndbapi/testBlobs.cpp:
  mvdir
storage/ndb/test/ndbapi/testDataBuffers.cpp:
  mvdir
storage/ndb/test/ndbapi/testDeadlock.cpp:
  mvdir
storage/ndb/test/ndbapi/testDict.cpp:
  mvdir
storage/ndb/test/ndbapi/testGrep.cpp:
  mvdir
storage/ndb/test/ndbapi/testGrepVerify.cpp:
  mvdir
storage/ndb/test/ndbapi/testIndex.cpp:
  mvdir
storage/ndb/test/ndbapi/testInterpreter.cpp:
  mvdir
storage/ndb/test/ndbapi/testLcp.cpp:
  mvdir
storage/ndb/test/ndbapi/testMgm.cpp:
  mvdir
storage/ndb/test/ndbapi/testNdbApi.cpp:
  mvdir
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  mvdir
storage/ndb/test/ndbapi/testOIBasic.cpp:
  mvdir
storage/ndb/test/ndbapi/testOperations.cpp:
  mvdir
storage/ndb/test/ndbapi/testOrderedIndex.cpp:
  mvdir
storage/ndb/test/ndbapi/testPartitioning.cpp:
  mvdir
storage/ndb/test/ndbapi/testReadPerf.cpp:
  mvdir
storage/ndb/test/ndbapi/testRestartGci.cpp:
  mvdir
storage/ndb/test/ndbapi/bank/Bank.cpp:
  mvdir
storage/ndb/test/ndbapi/bank/Bank.hpp:
  mvdir
storage/ndb/test/ndbapi/bank/BankLoad.cpp:
  mvdir
storage/ndb/test/ndbapi/bank/Makefile.am:
  mvdir
storage/ndb/test/ndbapi/bank/bankCreator.cpp:
  mvdir
storage/ndb/test/ndbapi/bank/bankMakeGL.cpp:
  mvdir
storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp:
  mvdir
storage/ndb/test/ndbapi/bank/bankTimer.cpp:
  mvdir
storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp:
  mvdir
storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp:
  mvdir
storage/ndb/test/ndbapi/bank/testBank.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/asyncGenerator.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/dbGenerator.h:
  mvdir
storage/ndb/test/ndbapi/bench/dbPopulate.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/dbPopulate.h:
  mvdir
storage/ndb/test/ndbapi/bench/macros.h:
  mvdir
storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/mainPopulate.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/ndb_async1.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/ndb_async2.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/ndb_error.hpp:
  mvdir
storage/ndb/test/ndbapi/bench/ndb_schema.hpp:
  mvdir
storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp:
  mvdir
storage/ndb/test/ndbapi/testScan.cpp:
  mvdir
storage/ndb/test/ndbapi/testScanInterpreter.cpp:
  mvdir
storage/ndb/test/ndbapi/testScanPerf.cpp:
  mvdir
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  mvdir
storage/ndb/test/ndbapi/testTimeout.cpp:
  mvdir
storage/ndb/test/ndbapi/testTransactions.cpp:
  mvdir
storage/ndb/test/ndbapi/test_event.cpp:
  mvdir
storage/ndb/test/ndbapi/test_event_multi_table.cpp:
  mvdir
storage/ndb/test/ndbapi/userInterface.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/testData.h:
  mvdir
storage/ndb/test/ndbapi/bench/testDefinitions.h:
  mvdir
storage/ndb/test/ndbapi/bench/userInterface.cpp:
  mvdir
storage/ndb/test/ndbapi/bench/userInterface.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/acid/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/acid2/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp:
  mvdir
storage/ndb/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp:
  mvdir
storage/ndb/test/ndbapi/old_dirs/basicAsynch/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/bulk_copy/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/create_all_tabs/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/create_tab/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/drop_all_tabs/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/flexAsynch/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am:
  mvdir
storage/ndb/test/ndbapi/old_dirs/flexBench/ndbplot.pl:
  mvdir
storage/ndb/test/ndbapi/old_dirs/flexHammer/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/flexHammer/README:
  mvdir
storage/ndb/test/ndbapi/old_dirs/flexScan/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/flexScan/README:
  mvdir
storage/ndb/test/ndbapi/old_dirs/flexTT/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/flexTimedAsynch/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/flex_bench_mysql/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/indexTest/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/indexTest2/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/interpreterInTup/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/generator/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/bin/.empty:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/lib/.empty:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l-p10.sh:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l.sh:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-p10.sh:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench.sh:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/README:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.linux:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.sparc:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c:
  mvdir
storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c:
  mvdir
storage/ndb/test/ndbapi/old_dirs/restarter/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/restarter2/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/restarts/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/ronja/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/ronja/benchronja/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/ronja/initronja/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/telco/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/telco/readme:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testBackup/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testBasic/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testBlobs/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testDataBuffers/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testDict/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testGrep/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testIndex/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testInterpreter/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testMgm/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testNdbApi/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testNodeRestart/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testOIBasic/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testOIBasic/times.txt:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testOperations/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testOrderedIndex/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testRestartGci/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testScan/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testScanInterpreter/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testSystemRestart/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testTimeout/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/testTransactions/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/test_event/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/vw_test/Makefile:
  mvdir
storage/ndb/test/ndbapi/old_dirs/vw_test/bcd.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/vw_test/script/client_start:
  mvdir
storage/ndb/test/ndbapi/old_dirs/vw_test/utv.h:
  mvdir
storage/ndb/test/ndbapi/old_dirs/vw_test/vcdrfunc.h:
  mvdir
storage/ndb/test/ndbnet/test.run:
  mvdir
storage/ndb/test/ndbnet/testError.run:
  mvdir
storage/ndb/test/ndbnet/testMNF.run:
  mvdir
storage/ndb/test/ndbnet/testNR.run:
  mvdir
storage/ndb/test/ndbnet/testNR1.run:
  mvdir
storage/ndb/test/ndbnet/testNR4.run:
  mvdir
storage/ndb/test/ndbnet/testSRhang.run:
  mvdir
storage/ndb/test/ndbnet/testTR295.run:
  mvdir
storage/ndb/test/newtonapi/basic_test/Makefile:
  mvdir
storage/ndb/test/newtonapi/basic_test/basic/Makefile:
  mvdir
storage/ndb/test/newtonapi/basic_test/basic/basic.cpp:
  mvdir
storage/ndb/test/newtonapi/basic_test/bulk_read/Makefile:
  mvdir
storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp:
  mvdir
storage/ndb/test/newtonapi/basic_test/common.cpp:
  mvdir
storage/ndb/test/newtonapi/basic_test/common.hpp:
  mvdir
storage/ndb/test/newtonapi/basic_test/ptr_binding/Makefile:
  mvdir
storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp:
  mvdir
storage/ndb/test/newtonapi/basic_test/too_basic.cpp:
  mvdir
storage/ndb/test/newtonapi/perf_test/Makefile:
  mvdir
storage/ndb/test/newtonapi/perf_test/perf.cpp:
  mvdir
storage/ndb/test/odbc/SQL99_test/Makefile:
  mvdir
storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp:
  mvdir
storage/ndb/test/odbc/SQL99_test/SQL99_test.h:
  mvdir
storage/ndb/test/odbc/client/Makefile:
  mvdir
storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp:
  mvdir
storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp:
  mvdir
storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp:
  mvdir
storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLBindColTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLBindParameterTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLCancelTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLColAttributeTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLConnectTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLCopyDescTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLDescribeColTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLDisconnectTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLEndTranTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLErrorTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLExecDirectTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLExecuteTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLFetchTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetDataTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetInfoTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLParamDataTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLPrepareTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLPutDataTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLRowCountTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLTablesTest.cpp:
  mvdir
storage/ndb/test/odbc/client/SQLTransactTest.cpp:
  mvdir
storage/ndb/test/odbc/client/common.hpp:
  mvdir
storage/ndb/test/odbc/client/main.cpp:
  mvdir
storage/ndb/test/odbc/dm-iodbc/Makefile:
  mvdir
storage/ndb/test/odbc/dm-unixodbc/Makefile:
  mvdir
storage/ndb/test/odbc/driver/Makefile:
  mvdir
storage/ndb/test/odbc/driver/testOdbcDriver.cpp:
  mvdir
storage/ndb/test/odbc/test_compiler/Makefile:
  mvdir
storage/ndb/test/odbc/test_compiler/test_compiler.cpp:
  mvdir
storage/ndb/test/run-test/16node-tests.txt:
  mvdir
storage/ndb/test/run-test/Makefile.am:
  mvdir
storage/ndb/test/run-test/README.ATRT:
  mvdir
storage/ndb/test/run-test/README:
  mvdir
storage/ndb/test/run-test/atrt-analyze-result.sh:
  mvdir
storage/ndb/test/run-test/atrt-clear-result.sh:
  mvdir
storage/ndb/test/run-test/atrt-example.tgz:
  mvdir
storage/ndb/test/run-test/atrt-gather-result.sh:
  mvdir
storage/ndb/test/run-test/atrt-mysql-test-run:
  mvdir
storage/ndb/test/run-test/atrt-setup.sh:
  mvdir
storage/ndb/test/run-test/atrt-testBackup:
  mvdir
storage/ndb/test/run-test/basic.txt:
  mvdir
storage/ndb/test/run-test/daily-basic-tests.txt:
  mvdir
storage/ndb/test/run-test/daily-devel-tests.txt:
  mvdir
storage/ndb/test/run-test/example.conf:
  mvdir
storage/ndb/test/run-test/main.cpp:
  mvdir
storage/ndb/test/run-test/make-config.sh:
  mvdir
storage/ndb/test/run-test/make-html-reports.sh:
  mvdir
storage/ndb/test/run-test/make-index.sh:
  mvdir
storage/ndb/test/run-test/ndb-autotest.sh:
  mvdir
storage/ndb/test/run-test/run-test.hpp:
  mvdir
storage/ndb/test/src/CpcClient.cpp:
  mvdir
storage/ndb/test/src/HugoAsynchTransactions.cpp:
  mvdir
storage/ndb/test/src/HugoCalculator.cpp:
  mvdir
storage/ndb/test/src/HugoOperations.cpp:
  mvdir
storage/ndb/test/src/HugoTransactions.cpp:
  mvdir
storage/ndb/test/src/Makefile.am:
  mvdir
storage/ndb/test/src/NDBT_Error.cpp:
  mvdir
storage/ndb/test/src/NDBT_Output.cpp:
  mvdir
storage/ndb/test/src/NDBT_ResultRow.cpp:
  mvdir
storage/ndb/test/src/NDBT_ReturnCodes.cpp:
  mvdir
storage/ndb/test/src/NDBT_Table.cpp:
  mvdir
storage/ndb/test/src/NDBT_Tables.cpp:
  mvdir
storage/ndb/test/src/NDBT_Test.cpp:
  mvdir
storage/ndb/test/src/NdbBackup.cpp:
  mvdir
storage/ndb/test/src/NdbConfig.cpp:
  mvdir
storage/ndb/test/src/NdbGrep.cpp:
  mvdir
storage/ndb/test/src/NdbRestarter.cpp:
  mvdir
storage/ndb/test/src/NdbRestarts.cpp:
  mvdir
storage/ndb/test/src/NdbSchemaCon.cpp:
  mvdir
storage/ndb/test/src/NdbSchemaOp.cpp:
  mvdir
storage/ndb/test/src/UtilTransactions.cpp:
  mvdir
storage/ndb/test/src/getarg.c:
  mvdir
storage/ndb/test/tools/Makefile.am:
  mvdir
storage/ndb/test/tools/copy_tab.cpp:
  mvdir
storage/ndb/test/tools/cpcc.cpp:
  mvdir
storage/ndb/test/tools/create_index.cpp:
  mvdir
storage/ndb/test/tools/hugoCalculator.cpp:
  mvdir
storage/ndb/test/tools/hugoFill.cpp:
  mvdir
storage/ndb/test/tools/hugoLoad.cpp:
  mvdir
storage/ndb/test/tools/hugoLockRecords.cpp:
  mvdir
storage/ndb/test/tools/hugoPkDelete.cpp:
  mvdir
storage/ndb/test/tools/hugoPkRead.cpp:
  mvdir
storage/ndb/test/tools/hugoPkReadRecord.cpp:
  mvdir
storage/ndb/test/tools/hugoPkUpdate.cpp:
  mvdir
storage/ndb/test/tools/hugoScanRead.cpp:
  mvdir
storage/ndb/test/tools/hugoScanUpdate.cpp:
  mvdir
storage/ndb/test/tools/old_dirs/hugoCalculator/Makefile:
  mvdir
storage/ndb/test/tools/old_dirs/hugoFill/Makefile:
  mvdir
storage/ndb/test/tools/old_dirs/hugoLoad/Makefile:
  mvdir
storage/ndb/test/tools/old_dirs/hugoLockRecords/Makefile:
  mvdir
storage/ndb/test/tools/old_dirs/hugoPkDelete/Makefile:
  mvdir
storage/ndb/test/tools/old_dirs/hugoPkRead/Makefile:
  mvdir
storage/ndb/test/tools/restart.cpp:
  mvdir
storage/ndb/test/tools/transproxy.cpp:
  mvdir
storage/ndb/test/tools/verify_index.cpp:
  mvdir
storage/ndb/test/tools/old_dirs/hugoPkReadRecord/Makefile:
  mvdir
storage/ndb/test/tools/old_dirs/hugoPkUpdate/Makefile:
  mvdir
storage/ndb/test/tools/old_dirs/hugoScanRead/Makefile:
  mvdir
storage/ndb/test/tools/old_dirs/hugoScanUpdate/Makefile:
  mvdir
storage/ndb/test/tools/old_dirs/restart/Makefile:
  mvdir
storage/ndb/test/tools/old_dirs/transproxy/Makefile:
  mvdir
storage/ndb/test/tools/old_dirs/verify_index/Makefile:
  mvdir
storage/ndb/test/tools/old_dirs/waiter/waiter.cpp:
  mvdir
storage/ndb/tools/Makefile.am:
  mvdir
storage/ndb/tools/clean-links.sh:
  mvdir
storage/ndb/tools/delete_all.cpp:
  mvdir
storage/ndb/tools/desc.cpp:
  mvdir
storage/ndb/tools/drop_index.cpp:
  mvdir
storage/ndb/tools/drop_tab.cpp:
  mvdir
storage/ndb/tools/listTables.cpp:
  mvdir
storage/ndb/tools/make-errors.pl:
  mvdir
storage/ndb/tools/make-links.sh:
  mvdir
storage/ndb/tools/ndb_test_platform.cpp:
  mvdir
storage/ndb/tools/ndbsql.cpp:
  mvdir
storage/ndb/tools/old_dirs/copy_tab/Makefile:
  mvdir
storage/ndb/tools/old_dirs/cpcc/Makefile:
  mvdir
storage/ndb/tools/old_dirs/create_index/Makefile:
  mvdir
storage/ndb/tools/old_dirs/delete_all/Makefile:
  mvdir
storage/ndb/tools/old_dirs/desc/Makefile:
  mvdir
storage/ndb/tools/old_dirs/drop_index/Makefile:
  mvdir
storage/ndb/tools/old_dirs/drop_tab/Makefile:
  mvdir
storage/ndb/tools/old_dirs/list_tables/Makefile:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/Makefile.PL:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/ndbnet.pl:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/ndbnetd.pl:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/ndbrun:
  mvdir
storage/ndb/tools/rgrep:
  mvdir
storage/ndb/tools/select_all.cpp:
  mvdir
storage/ndb/tools/select_count.cpp:
  mvdir
storage/ndb/tools/waiter.cpp:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm:
  mvdir
storage/ndb/tools/old_dirs/ndbsql/Makefile:
  mvdir
storage/ndb/tools/old_dirs/select_all/Makefile:
  mvdir
storage/ndb/tools/old_dirs/select_count/Makefile:
  mvdir
storage/ndb/tools/old_dirs/src/counterviewer/CounterViewer.java:
  mvdir
storage/ndb/tools/restore/Restore.cpp:
  mvdir
storage/ndb/tools/restore/Restore.hpp:
  mvdir
storage/ndb/tools/restore/consumer.cpp:
  mvdir
storage/ndb/tools/restore/consumer.hpp:
  mvdir
storage/ndb/tools/restore/consumer_printer.cpp:
  mvdir
storage/ndb/tools/restore/consumer_printer.hpp:
  mvdir
storage/ndb/tools/restore/consumer_restore.cpp:
  mvdir
storage/ndb/tools/restore/consumer_restore.hpp:
  mvdir
storage/ndb/tools/restore/consumer_restorem.cpp:
  mvdir
storage/ndb/tools/restore/restore_main.cpp:
  mvdir
storage/bdb/LICENSE:
  mvdir
storage/bdb/Makefile.in:
  mvdir
storage/bdb/btree/bt_compare.c:
  mvdir
storage/bdb/btree/bt_conv.c:
  mvdir
storage/bdb/btree/bt_curadj.c:
  mvdir
storage/bdb/btree/bt_cursor.c:
  mvdir
storage/bdb/btree/bt_delete.c:
  mvdir
storage/bdb/btree/bt_method.c:
  mvdir
storage/bdb/btree/bt_open.c:
  mvdir
storage/bdb/btree/bt_put.c:
  mvdir
storage/bdb/btree/bt_rec.c:
  mvdir
storage/bdb/btree/bt_reclaim.c:
  mvdir
storage/bdb/btree/bt_recno.c:
  mvdir
storage/bdb/btree/bt_rsearch.c:
  mvdir
storage/bdb/btree/bt_search.c:
  mvdir
storage/bdb/btree/bt_split.c:
  mvdir
storage/bdb/btree/bt_stat.c:
  mvdir
storage/bdb/btree/bt_upgrade.c:
  mvdir
storage/bdb/btree/bt_verify.c:
  mvdir
storage/bdb/btree/btree.src:
  mvdir
storage/bdb/build_unix/.IGNORE_ME:
  mvdir
storage/bdb/build_vxworks/BerkeleyDB.wsp:
  mvdir
storage/bdb/build_vxworks/dbdemo/README:
  mvdir
storage/bdb/build_win32/Berkeley_DB.dsw:
  mvdir
storage/bdb/build_win32/app_dsp.src:
  mvdir
storage/bdb/build_win32/build_all.dsp:
  mvdir
storage/bdb/build_win32/db_java_xa.dsp:
  mvdir
storage/bdb/build_win32/db_java_xaj.mak:
  mvdir
storage/bdb/build_win32/db_lib.dsp:
  mvdir
storage/bdb/build_win32/db_test.src:
  mvdir
storage/bdb/build_win32/dbkill.cpp:
  mvdir
storage/bdb/build_win32/dllmain.c:
  mvdir
storage/bdb/build_win32/dynamic_dsp.src:
  mvdir
storage/bdb/build_win32/java_dsp.src:
  mvdir
storage/bdb/build_win32/libdb_tcl.def:
  mvdir
storage/bdb/build_win32/libdbrc.src:
  mvdir
storage/bdb/build_win32/srcfile_dsp.src:
  mvdir
storage/bdb/build_win32/static_dsp.src:
  mvdir
storage/bdb/build_win32/tcl_dsp.src:
  mvdir
storage/bdb/clib/getcwd.c:
  mvdir
storage/bdb/clib/getopt.c:
  mvdir
storage/bdb/clib/memcmp.c:
  mvdir
storage/bdb/clib/memmove.c:
  mvdir
storage/bdb/clib/raise.c:
  mvdir
storage/bdb/clib/snprintf.c:
  mvdir
storage/bdb/clib/strcasecmp.c:
  mvdir
storage/bdb/clib/strdup.c:
  mvdir
storage/bdb/clib/strerror.c:
  mvdir
storage/bdb/clib/vsnprintf.c:
  mvdir
storage/bdb/common/db_byteorder.c:
  mvdir
storage/bdb/common/db_err.c:
  mvdir
storage/bdb/common/db_getlong.c:
  mvdir
storage/bdb/common/db_idspace.c:
  mvdir
storage/bdb/common/db_log2.c:
  mvdir
storage/bdb/common/util_arg.c:
  mvdir
storage/bdb/common/util_cache.c:
  mvdir
storage/bdb/common/util_log.c:
  mvdir
storage/bdb/common/util_sig.c:
  mvdir
storage/bdb/cxx/cxx_db.cpp:
  mvdir
storage/bdb/cxx/cxx_dbc.cpp:
  mvdir
storage/bdb/cxx/cxx_dbt.cpp:
  mvdir
storage/bdb/cxx/cxx_env.cpp:
  mvdir
storage/bdb/cxx/cxx_except.cpp:
  mvdir
storage/bdb/cxx/cxx_lock.cpp:
  mvdir
storage/bdb/cxx/cxx_logc.cpp:
  mvdir
storage/bdb/cxx/cxx_mpool.cpp:
  mvdir
storage/bdb/cxx/cxx_txn.cpp:
  mvdir
storage/bdb/db/crdel.src:
  mvdir
storage/bdb/db/crdel_rec.c:
  mvdir
storage/bdb/db/db.c:
  mvdir
storage/bdb/db/db.src:
  mvdir
storage/bdb/db/db_am.c:
  mvdir
storage/bdb/db/db_cam.c:
  mvdir
storage/bdb/db/db_conv.c:
  mvdir
storage/bdb/db/db_dispatch.c:
  mvdir
storage/bdb/db/db_dup.c:
  mvdir
storage/bdb/db/db_iface.c:
  mvdir
storage/bdb/db/db_join.c:
  mvdir
storage/bdb/db/db_meta.c:
  mvdir
storage/bdb/db/db_method.c:
  mvdir
storage/bdb/db/db_open.c:
  mvdir
storage/bdb/db/db_overflow.c:
  mvdir
storage/bdb/db/db_pr.c:
  mvdir
storage/bdb/db/db_rec.c:
  mvdir
storage/bdb/db/db_reclaim.c:
  mvdir
storage/bdb/db/db_remove.c:
  mvdir
storage/bdb/db/db_rename.c:
  mvdir
storage/bdb/db/db_ret.c:
  mvdir
storage/bdb/db/db_truncate.c:
  mvdir
storage/bdb/db/db_upg.c:
  mvdir
storage/bdb/db/db_upg_opd.c:
  mvdir
storage/bdb/db/db_vrfy.c:
  mvdir
storage/bdb/db/db_vrfyutil.c:
  mvdir
storage/bdb/db185/db185.c:
  mvdir
storage/bdb/db185/db185_int.in:
  mvdir
storage/bdb/db_archive/db_archive.c:
  mvdir
storage/bdb/db_checkpoint/db_checkpoint.c:
  mvdir
storage/bdb/db_deadlock/db_deadlock.c:
  mvdir
storage/bdb/db_dump/db_dump.c:
  mvdir
storage/bdb/db_dump185/db_dump185.c:
  mvdir
storage/bdb/db_load/db_load.c:
  mvdir
storage/bdb/db_printlog/README:
  mvdir
storage/bdb/db_printlog/commit.awk:
  mvdir
storage/bdb/db_printlog/count.awk:
  mvdir
storage/bdb/db_printlog/db_printlog.c:
  mvdir
storage/bdb/db_printlog/dbname.awk:
  mvdir
storage/bdb/db_printlog/fileid.awk:
  mvdir
storage/bdb/db_printlog/logstat.awk:
  mvdir
storage/bdb/db_printlog/pgno.awk:
  mvdir
storage/bdb/db_printlog/range.awk:
  mvdir
storage/bdb/db_printlog/rectype.awk:
  mvdir
storage/bdb/db_printlog/status.awk:
  mvdir
storage/bdb/db_printlog/txn.awk:
  mvdir
storage/bdb/db_recover/db_recover.c:
  mvdir
storage/bdb/db_stat/db_stat.c:
  mvdir
storage/bdb/db_upgrade/db_upgrade.c:
  mvdir
storage/bdb/db_verify/db_verify.c:
  mvdir
storage/bdb/dbinc/btree.h:
  mvdir
storage/bdb/dbinc/crypto.h:
  mvdir
storage/bdb/dbinc/cxx_common.h:
  mvdir
storage/bdb/dbinc/cxx_except.h:
  mvdir
storage/bdb/dbinc/cxx_int.h:
  mvdir
storage/bdb/dbinc/db.in:
  mvdir
storage/bdb/dbinc/db_185.in:
  mvdir
storage/bdb/dbinc/db_am.h:
  mvdir
storage/bdb/dbinc/db_cxx.in:
  mvdir
storage/bdb/dbinc/db_dispatch.h:
  mvdir
storage/bdb/dbinc/db_int.in:
  mvdir
storage/bdb/dbinc/db_join.h:
  mvdir
storage/bdb/dbinc/db_page.h:
  mvdir
storage/bdb/dbinc/db_server_int.h:
  mvdir
storage/bdb/dbinc/db_shash.h:
  mvdir
storage/bdb/dbinc/db_swap.h:
  mvdir
storage/bdb/dbinc/db_upgrade.h:
  mvdir
storage/bdb/dbinc/db_verify.h:
  mvdir
storage/bdb/dbinc/debug.h:
  mvdir
storage/bdb/dbinc/fop.h:
  mvdir
storage/bdb/dbinc/globals.h:
  mvdir
storage/bdb/dbinc/hash.h:
  mvdir
storage/bdb/dbinc/hmac.h:
  mvdir
storage/bdb/dbinc/lock.h:
  mvdir
storage/bdb/dbinc/log.h:
  mvdir
storage/bdb/dbinc/mp.h:
  mvdir
storage/bdb/dbinc/mutex.h:
  mvdir
storage/bdb/dbinc/os.h:
  mvdir
storage/bdb/dbinc/qam.h:
  mvdir
storage/bdb/dbinc/queue.h:
  mvdir
storage/bdb/dbinc/region.h:
  mvdir
storage/bdb/dbinc/rep.h:
  mvdir
storage/bdb/dbinc/shqueue.h:
  mvdir
storage/bdb/dbinc/tcl_db.h:
  mvdir
storage/bdb/dbinc/txn.h:
  mvdir
storage/bdb/dbinc/xa.h:
  mvdir
storage/bdb/dbm/dbm.c:
  mvdir
storage/bdb/dbreg/dbreg.c:
  mvdir
storage/bdb/dbreg/dbreg.src:
  mvdir
storage/bdb/dbreg/dbreg_rec.c:
  mvdir
storage/bdb/dbreg/dbreg_util.c:
  mvdir
storage/bdb/dist/Makefile.in:
  mvdir
storage/bdb/dist/RELEASE:
  mvdir
storage/bdb/dist/buildrel:
  mvdir
storage/bdb/dist/config.guess:
  mvdir
storage/bdb/dist/config.sub:
  mvdir
storage/bdb/dist/configure.ac:
  mvdir
storage/bdb/dist/db.ecd.in:
  mvdir
storage/bdb/dist/db.spec.in:
  mvdir
storage/bdb/dist/gen_inc.awk:
  mvdir
storage/bdb/dist/gen_rec.awk:
  mvdir
storage/bdb/dist/gen_rpc.awk:
  mvdir
storage/bdb/dist/install-sh:
  mvdir
storage/bdb/dist/ltmain.sh:
  mvdir
storage/bdb/dist/pubdef.in:
  mvdir
storage/bdb/dist/s_all:
  mvdir
storage/bdb/dist/s_config:
  mvdir
storage/bdb/dist/aclocal/config.ac:
  mvdir
storage/bdb/dist/aclocal/cxx.ac:
  mvdir
storage/bdb/dist/aclocal/gcc.ac:
  mvdir
storage/bdb/dist/aclocal/libtool.ac:
  mvdir
storage/bdb/dist/s_crypto:
  mvdir
storage/bdb/dist/s_dir:
  mvdir
storage/bdb/dist/s_include:
  mvdir
storage/bdb/dist/s_javah:
  mvdir
storage/bdb/dist/s_java:
  mvdir
storage/bdb/dist/s_perm:
  mvdir
storage/bdb/dist/s_readme:
  mvdir
storage/bdb/dist/s_recover:
  mvdir
storage/bdb/dist/s_rpc:
  mvdir
storage/bdb/dist/s_symlink:
  mvdir
storage/bdb/dist/s_tags:
  mvdir
storage/bdb/dist/s_test:
  mvdir
storage/bdb/dist/s_vxworks:
  mvdir
storage/bdb/dist/s_win32_dsp:
  mvdir
storage/bdb/dist/s_win32:
  mvdir
storage/bdb/dist/srcfiles.in:
  mvdir
storage/bdb/dist/vx_buildcd:
  mvdir
storage/bdb/dist/vx_config.in:
  mvdir
storage/bdb/dist/win_config.in:
  mvdir
storage/bdb/dist/win_exports.in:
  mvdir
storage/bdb/dist/aclocal/mutex.ac:
  mvdir
storage/bdb/dist/aclocal/options.ac:
  mvdir
storage/bdb/dist/aclocal/programs.ac:
  mvdir
storage/bdb/dist/aclocal/sosuffix.ac:
  mvdir
storage/bdb/dist/aclocal/tcl.ac:
  mvdir
storage/bdb/dist/aclocal/types.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_check_class.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_check_classpath.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_check_junit.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_check_rqrd_class.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_java_options.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_jni_include_dirs.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_prog_jar.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_prog_java.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_prog_java_works.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_prog_javac.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_prog_javac_works.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_prog_javadoc.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_prog_javah.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_try_compile_java.ac:
  mvdir
storage/bdb/dist/aclocal_java/ac_try_run_javac.ac:
  mvdir
storage/bdb/dist/template/rec_ctemp:
  mvdir
storage/bdb/dist/vx_2.0/BerkeleyDB.wpj:
  mvdir
storage/bdb/dist/vx_2.0/wpj.in:
  mvdir
storage/bdb/dist/vx_3.1/Makefile.custom:
  mvdir
storage/bdb/dist/vx_3.1/cdf.1:
  mvdir
storage/bdb/dist/vx_3.1/cdf.2:
  mvdir
storage/bdb/dist/vx_3.1/cdf.3:
  mvdir
storage/bdb/dist/vx_3.1/component.cdf:
  mvdir
storage/bdb/dist/vx_3.1/component.wpj:
  mvdir
storage/bdb/dist/vx_3.1/wpj.1:
  mvdir
storage/bdb/dist/vx_3.1/wpj.2:
  mvdir
storage/bdb/dist/vx_3.1/wpj.3:
  mvdir
storage/bdb/dist/vx_3.1/wpj.4:
  mvdir
storage/bdb/dist/vx_3.1/wpj.5:
  mvdir
storage/bdb/dist/vx_setup/CONFIG.in:
  mvdir
storage/bdb/dist/vx_setup/LICENSE.TXT:
  mvdir
storage/bdb/dist/vx_setup/MESSAGES.TCL:
  mvdir
storage/bdb/dist/vx_setup/README.in:
  mvdir
storage/bdb/dist/vx_setup/SETUP.BMP:
  mvdir
storage/bdb/dist/vx_setup/vx_allfile.in:
  mvdir
storage/bdb/dist/vx_setup/vx_demofile.in:
  mvdir
storage/bdb/dist/vx_setup/vx_setup.in:
  mvdir
storage/bdb/env/db_salloc.c:
  mvdir
storage/bdb/env/db_shash.c:
  mvdir
storage/bdb/env/env_file.c:
  mvdir
storage/bdb/env/env_method.c.b:
  mvdir
storage/bdb/env/env_method.c:
  mvdir
storage/bdb/env/env_open.c:
  mvdir
storage/bdb/env/env_recover.c:
  mvdir
storage/bdb/env/env_region.c:
  mvdir
storage/bdb/fileops/fileops.src:
  mvdir
storage/bdb/fileops/fop_basic.c:
  mvdir
storage/bdb/fileops/fop_rec.c:
  mvdir
storage/bdb/fileops/fop_util.c:
  mvdir
storage/bdb/hash/hash.c:
  mvdir
storage/bdb/hash/hash.src:
  mvdir
storage/bdb/hash/hash_conv.c:
  mvdir
storage/bdb/hash/hash_dup.c:
  mvdir
storage/bdb/hash/hash_func.c:
  mvdir
storage/bdb/hash/hash_meta.c:
  mvdir
storage/bdb/hash/hash_method.c:
  mvdir
storage/bdb/hash/hash_open.c:
  mvdir
storage/bdb/hash/hash_page.c:
  mvdir
storage/bdb/hash/hash_rec.c:
  mvdir
storage/bdb/hash/hash_reclaim.c:
  mvdir
storage/bdb/hash/hash_stat.c:
  mvdir
storage/bdb/hash/hash_upgrade.c:
  mvdir
storage/bdb/hash/hash_verify.c:
  mvdir
storage/bdb/hmac/hmac.c:
  mvdir
storage/bdb/hmac/sha1.c:
  mvdir
storage/bdb/hsearch/hsearch.c:
  mvdir
storage/bdb/libdb_java/checkapi.prl:
  mvdir
storage/bdb/libdb_java/com_sleepycat_db_Db.h:
  mvdir
storage/bdb/libdb_java/com_sleepycat_db_DbEnv.h:
  mvdir
storage/bdb/libdb_java/com_sleepycat_db_DbLock.h:
  mvdir
storage/bdb/libdb_java/com_sleepycat_db_DbLogc.h:
  mvdir
storage/bdb/libdb_java/com_sleepycat_db_DbLsn.h:
  mvdir
storage/bdb/libdb_java/com_sleepycat_db_DbTxn.h:
  mvdir
storage/bdb/libdb_java/com_sleepycat_db_DbUtil.h:
  mvdir
storage/bdb/libdb_java/com_sleepycat_db_Dbc.h:
  mvdir
storage/bdb/libdb_java/com_sleepycat_db_Dbt.h:
  mvdir
storage/bdb/libdb_java/com_sleepycat_db_xa_DbXAResource.h:
  mvdir
storage/bdb/libdb_java/java_Db.c:
  mvdir
storage/bdb/libdb_java/java_DbEnv.c:
  mvdir
storage/bdb/libdb_java/java_DbLock.c:
  mvdir
storage/bdb/libdb_java/java_DbLogc.c:
  mvdir
storage/bdb/libdb_java/java_DbLsn.c:
  mvdir
storage/bdb/libdb_java/java_DbTxn.c:
  mvdir
storage/bdb/libdb_java/java_DbUtil.c:
  mvdir
storage/bdb/libdb_java/java_DbXAResource.c:
  mvdir
storage/bdb/libdb_java/java_Dbc.c:
  mvdir
storage/bdb/libdb_java/java_Dbt.c:
  mvdir
storage/bdb/libdb_java/java_info.c:
  mvdir
storage/bdb/libdb_java/java_info.h:
  mvdir
storage/bdb/libdb_java/java_locked.c:
  mvdir
storage/bdb/libdb_java/java_locked.h:
  mvdir
storage/bdb/libdb_java/java_util.c:
  mvdir
storage/bdb/libdb_java/java_util.h:
  mvdir
storage/bdb/lock/Design:
  mvdir
storage/bdb/lock/lock.c:
  mvdir
storage/bdb/lock/lock_deadlock.c:
  mvdir
storage/bdb/lock/lock_method.c:
  mvdir
storage/bdb/lock/lock_region.c:
  mvdir
storage/bdb/lock/lock_stat.c:
  mvdir
storage/bdb/lock/lock_util.c:
  mvdir
storage/bdb/log/log.c:
  mvdir
storage/bdb/log/log_archive.c:
  mvdir
storage/bdb/log/log_compare.c:
  mvdir
storage/bdb/log/log_get.c:
  mvdir
storage/bdb/log/log_method.c:
  mvdir
storage/bdb/log/log_put.c:
  mvdir
storage/bdb/mp/mp_alloc.c:
  mvdir
storage/bdb/mp/mp_bh.c:
  mvdir
storage/bdb/mp/mp_fget.c:
  mvdir
storage/bdb/mp/mp_fopen.c:
  mvdir
storage/bdb/mp/mp_fput.c:
  mvdir
storage/bdb/mp/mp_fset.c:
  mvdir
storage/bdb/mp/mp_method.c:
  mvdir
storage/bdb/mp/mp_region.c:
  mvdir
storage/bdb/mp/mp_register.c:
  mvdir
storage/bdb/mp/mp_stat.c:
  mvdir
storage/bdb/mp/mp_sync.c:
  mvdir
storage/bdb/mp/mp_trickle.c:
  mvdir
storage/bdb/mutex/README:
  mvdir
storage/bdb/mutex/mut_fcntl.c:
  mvdir
storage/bdb/mutex/mut_pthread.c:
  mvdir
storage/bdb/mutex/mut_tas.c:
  mvdir
storage/bdb/mutex/mut_win32.c:
  mvdir
storage/bdb/mutex/mutex.c:
  mvdir
storage/bdb/mutex/tm.c:
  mvdir
storage/bdb/mutex/uts4_cc.s:
  mvdir
storage/bdb/os/os_abs.c:
  mvdir
storage/bdb/os/os_alloc.c:
  mvdir
storage/bdb/os/os_clock.c:
  mvdir
storage/bdb/os/os_config.c:
  mvdir
storage/bdb/os/os_dir.c:
  mvdir
storage/bdb/os/os_errno.c:
  mvdir
storage/bdb/os/os_fid.c:
  mvdir
storage/bdb/os/os_fsync.c:
  mvdir
storage/bdb/os/os_handle.c:
  mvdir
storage/bdb/os/os_id.c:
  mvdir
storage/bdb/os/os_map.c:
  mvdir
storage/bdb/os/os_method.c:
  mvdir
storage/bdb/os/os_oflags.c:
  mvdir
storage/bdb/os/os_open.c:
  mvdir
storage/bdb/os/os_region.c:
  mvdir
storage/bdb/os/os_rename.c:
  mvdir
storage/bdb/os/os_root.c:
  mvdir
storage/bdb/os/os_rpath.c:
  mvdir
storage/bdb/os/os_rw.c:
  mvdir
storage/bdb/os/os_seek.c:
  mvdir
storage/bdb/os/os_sleep.c:
  mvdir
storage/bdb/os/os_spin.c:
  mvdir
storage/bdb/os/os_stat.c:
  mvdir
storage/bdb/os/os_tmpdir.c:
  mvdir
storage/bdb/os/os_unlink.c:
  mvdir
storage/bdb/os_vxworks/os_vx_abs.c:
  mvdir
storage/bdb/os_vxworks/os_vx_config.c:
  mvdir
storage/bdb/os_vxworks/os_vx_map.c:
  mvdir
storage/bdb/os_win32/os_abs.c:
  mvdir
storage/bdb/os_win32/os_clock.c:
  mvdir
storage/bdb/os_win32/os_config.c:
  mvdir
storage/bdb/os_win32/os_dir.c:
  mvdir
storage/bdb/os_win32/os_errno.c:
  mvdir
storage/bdb/os_win32/os_fid.c:
  mvdir
storage/bdb/os_win32/os_fsync.c:
  mvdir
storage/bdb/os_win32/os_handle.c:
  mvdir
storage/bdb/os_win32/os_map.c:
  mvdir
storage/bdb/os_win32/os_open.c:
  mvdir
storage/bdb/os_win32/os_rename.c:
  mvdir
storage/bdb/os_win32/os_rw.c:
  mvdir
storage/bdb/os_win32/os_seek.c:
  mvdir
storage/bdb/os_win32/os_sleep.c:
  mvdir
storage/bdb/os_win32/os_spin.c:
  mvdir
storage/bdb/os_win32/os_stat.c:
  mvdir
storage/bdb/os_win32/os_type.c:
  mvdir
storage/bdb/perl/BerkeleyDB/BerkeleyDB.pm:
  mvdir
storage/bdb/perl/BerkeleyDB/BerkeleyDB.pod.P:
  mvdir
storage/bdb/perl/BerkeleyDB/BerkeleyDB.pod:
  mvdir
storage/bdb/perl/BerkeleyDB/BerkeleyDB.xs:
  mvdir
storage/bdb/perl/BerkeleyDB/Changes:
  mvdir
storage/bdb/perl/BerkeleyDB/MANIFEST:
  mvdir
storage/bdb/perl/BerkeleyDB/Makefile.PL:
  mvdir
storage/bdb/perl/BerkeleyDB/README:
  mvdir
storage/bdb/perl/BerkeleyDB/Todo:
  mvdir
storage/bdb/perl/BerkeleyDB/config.in:
  mvdir
storage/bdb/perl/BerkeleyDB/constants.h:
  mvdir
storage/bdb/perl/BerkeleyDB/constants.xs:
  mvdir
storage/bdb/perl/BerkeleyDB/dbinfo:
  mvdir
storage/bdb/perl/BerkeleyDB/mkconsts:
  mvdir
storage/bdb/perl/BerkeleyDB/mkpod:
  mvdir
storage/bdb/perl/BerkeleyDB/BerkeleyDB/Btree.pm:
  mvdir
storage/bdb/perl/BerkeleyDB/BerkeleyDB/Hash.pm:
  mvdir
storage/bdb/perl/BerkeleyDB/hints/dec_osf.pl:
  mvdir
storage/bdb/perl/BerkeleyDB/hints/irix_6_5.pl:
  mvdir
storage/bdb/perl/BerkeleyDB/hints/solaris.pl:
  mvdir
storage/bdb/perl/BerkeleyDB/patches/5.004_01:
  mvdir
storage/bdb/perl/BerkeleyDB/patches/5.004_02:
  mvdir
storage/bdb/perl/BerkeleyDB/patches/5.004_03:
  mvdir
storage/bdb/perl/BerkeleyDB/patches/5.004_04:
  mvdir
storage/bdb/perl/BerkeleyDB/patches/5.004_05:
  mvdir
storage/bdb/perl/BerkeleyDB/patches/5.004:
  mvdir
storage/bdb/perl/BerkeleyDB/patches/5.005_01:
  mvdir
storage/bdb/perl/BerkeleyDB/patches/5.005_02:
  mvdir
storage/bdb/perl/BerkeleyDB/patches/5.005_03:
  mvdir
storage/bdb/perl/BerkeleyDB/patches/5.005:
  mvdir
storage/bdb/perl/BerkeleyDB/patches/5.6.0:
  mvdir
storage/bdb/perl/BerkeleyDB/ppport.h:
  mvdir
storage/bdb/perl/BerkeleyDB/scan:
  mvdir
storage/bdb/perl/BerkeleyDB/t/btree.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/destroy.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/env.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/examples.t.T:
  mvdir
storage/bdb/perl/BerkeleyDB/t/examples.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/examples3.t.T:
  mvdir
storage/bdb/perl/BerkeleyDB/t/examples3.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/filter.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/hash.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/join.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/mldbm.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/queue.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/recno.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/strict.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/subdb.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/txn.t:
  mvdir
storage/bdb/perl/BerkeleyDB/typemap:
  mvdir
storage/bdb/perl/BerkeleyDB/t/unknown.t:
  mvdir
storage/bdb/perl/BerkeleyDB/t/util.pm:
  mvdir
storage/bdb/perl/DB_File/Changes:
  mvdir
storage/bdb/perl/DB_File/DB_File.pm:
  mvdir
storage/bdb/perl/DB_File/DB_File.xs:
  mvdir
storage/bdb/perl/DB_File/DB_File_BS:
  mvdir
storage/bdb/perl/DB_File/MANIFEST:
  mvdir
storage/bdb/perl/DB_File/Makefile.PL:
  mvdir
storage/bdb/perl/DB_File/README:
  mvdir
storage/bdb/perl/DB_File/config.in:
  mvdir
storage/bdb/perl/DB_File/dbinfo:
  mvdir
storage/bdb/perl/DB_File/fallback.h:
  mvdir
storage/bdb/perl/DB_File/fallback.xs:
  mvdir
storage/bdb/perl/DB_File/hints/dynixptx.pl:
  mvdir
storage/bdb/perl/DB_File/hints/sco.pl:
  mvdir
storage/bdb/perl/DB_File/patches/5.004_01:
  mvdir
storage/bdb/perl/DB_File/patches/5.004_02:
  mvdir
storage/bdb/perl/DB_File/patches/5.004_03:
  mvdir
storage/bdb/perl/DB_File/patches/5.004_04:
  mvdir
storage/bdb/perl/DB_File/patches/5.004_05:
  mvdir
storage/bdb/perl/DB_File/patches/5.004:
  mvdir
storage/bdb/perl/DB_File/patches/5.005_01:
  mvdir
storage/bdb/perl/DB_File/patches/5.005_02:
  mvdir
storage/bdb/perl/DB_File/patches/5.005_03:
  mvdir
storage/bdb/perl/DB_File/patches/5.005:
  mvdir
storage/bdb/perl/DB_File/patches/5.6.0:
  mvdir
storage/bdb/perl/DB_File/ppport.h:
  mvdir
storage/bdb/perl/DB_File/t/db-btree.t:
  mvdir
storage/bdb/perl/DB_File/t/db-hash.t:
  mvdir
storage/bdb/perl/DB_File/t/db-recno.t:
  mvdir
storage/bdb/perl/DB_File/typemap:
  mvdir
storage/bdb/perl/DB_File/version.c:
  mvdir
storage/bdb/qam/qam.c:
  mvdir
storage/bdb/qam/qam.src:
  mvdir
storage/bdb/qam/qam_conv.c:
  mvdir
storage/bdb/qam/qam_files.c:
  mvdir
storage/bdb/qam/qam_method.c:
  mvdir
storage/bdb/qam/qam_open.c:
  mvdir
storage/bdb/qam/qam_rec.c:
  mvdir
storage/bdb/qam/qam_stat.c:
  mvdir
storage/bdb/qam/qam_upgrade.c:
  mvdir
storage/bdb/qam/qam_verify.c:
  mvdir
storage/bdb/rep/rep_method.c:
  mvdir
storage/bdb/rep/rep_record.c:
  mvdir
storage/bdb/rep/rep_region.c:
  mvdir
storage/bdb/rep/rep_util.c:
  mvdir
storage/bdb/rpc_client/client.c:
  mvdir
storage/bdb/rpc_client/gen_client_ret.c:
  mvdir
storage/bdb/rpc_server/c/db_server_proc.c.in:
  mvdir
storage/bdb/rpc_server/c/db_server_util.c:
  mvdir
storage/bdb/rpc_server/clsrv.html:
  mvdir
storage/bdb/rpc_server/cxx/db_server_cxxproc.cpp:
  mvdir
storage/bdb/rpc_server/cxx/db_server_cxxutil.cpp:
  mvdir
storage/bdb/rpc_server/java/DbDispatcher.java:
  mvdir
storage/bdb/rpc_server/java/DbServer.java:
  mvdir
storage/bdb/rpc_server/java/FreeList.java:
  mvdir
storage/bdb/rpc_server/java/LocalIterator.java:
  mvdir
storage/bdb/rpc_server/java/README:
  mvdir
storage/bdb/rpc_server/java/RpcDb.java:
  mvdir
storage/bdb/rpc_server/java/RpcDbEnv.java:
  mvdir
storage/bdb/rpc_server/java/RpcDbTxn.java:
  mvdir
storage/bdb/rpc_server/java/RpcDbc.java:
  mvdir
storage/bdb/rpc_server/java/Timer.java:
  mvdir
storage/bdb/rpc_server/java/jrpcgen.jar:
  mvdir
storage/bdb/rpc_server/java/oncrpc.jar:
  mvdir
storage/bdb/rpc_server/rpc.src:
  mvdir
storage/bdb/rpc_server/java/gen/DbServerStub.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_associate_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_associate_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_bt_maxkey_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_bt_maxkey_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_bt_minkey_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_bt_minkey_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_close_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_close_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_create_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_create_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_cursor_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_cursor_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_del_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_del_reply.java:
  mvdir
storage/bdb/rpc_server/java/s_jrpcgen:
  mvdir
storage/bdb/rpc_server/java/gen/__db_encrypt_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_encrypt_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_extentsize_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_extentsize_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_flags_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_flags_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_get_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_get_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_h_ffactor_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_h_ffactor_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_h_nelem_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_h_nelem_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_join_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_join_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_key_range_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_key_range_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_lorder_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_lorder_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_open_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_open_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_pagesize_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_pagesize_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_pget_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_pget_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_put_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_put_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_re_delim_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_re_delim_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_re_len_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_re_len_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_re_pad_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_re_pad_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_remove_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_remove_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_rename_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_rename_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_stat_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_stat_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_sync_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_sync_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_truncate_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__db_truncate_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_close_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_close_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_count_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_count_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_del_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_del_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_dup_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_dup_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_get_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_get_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_pget_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_pget_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_put_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__dbc_put_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_cachesize_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_cachesize_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_close_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_close_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_create_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_create_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_dbremove_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_dbremove_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_dbrename_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_dbrename_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_encrypt_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_encrypt_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_flags_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_flags_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_open_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_open_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_remove_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__env_remove_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__txn_abort_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__txn_abort_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__txn_begin_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__txn_begin_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__txn_commit_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__txn_commit_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__txn_discard_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__txn_discard_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__txn_prepare_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__txn_prepare_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/__txn_recover_msg.java:
  mvdir
storage/bdb/rpc_server/java/gen/__txn_recover_reply.java:
  mvdir
storage/bdb/rpc_server/java/gen/db_server.java:
  mvdir
storage/bdb/tcl/tcl_compat.c:
  mvdir
storage/bdb/tcl/tcl_db.c:
  mvdir
storage/bdb/tcl/tcl_db_pkg.c:
  mvdir
storage/bdb/tcl/docs/db.html:
  mvdir
storage/bdb/tcl/docs/env.html:
  mvdir
storage/bdb/tcl/docs/historic.html:
  mvdir
storage/bdb/tcl/docs/index.html:
  mvdir
storage/bdb/tcl/docs/library.html:
  mvdir
storage/bdb/tcl/docs/lock.html:
  mvdir
storage/bdb/tcl/docs/log.html:
  mvdir
storage/bdb/tcl/docs/mpool.html:
  mvdir
storage/bdb/tcl/docs/rep.html:
  mvdir
storage/bdb/tcl/docs/test.html:
  mvdir
storage/bdb/tcl/docs/txn.html:
  mvdir
storage/bdb/tcl/tcl_dbcursor.c:
  mvdir
storage/bdb/tcl/tcl_env.c:
  mvdir
storage/bdb/tcl/tcl_internal.c:
  mvdir
storage/bdb/tcl/tcl_lock.c:
  mvdir
storage/bdb/tcl/tcl_log.c:
  mvdir
storage/bdb/tcl/tcl_mp.c:
  mvdir
storage/bdb/tcl/tcl_rep.c:
  mvdir
storage/bdb/tcl/tcl_txn.c:
  mvdir
storage/bdb/tcl/tcl_util.c:
  mvdir
storage/bdb/test/archive.tcl:
  mvdir
storage/bdb/test/bigfile001.tcl:
  mvdir
storage/bdb/test/bigfile002.tcl:
  mvdir
storage/bdb/test/byteorder.tcl:
  mvdir
storage/bdb/test/conscript.tcl:
  mvdir
storage/bdb/test/dbm.tcl:
  mvdir
storage/bdb/test/dbscript.tcl:
  mvdir
storage/bdb/test/ddoyscript.tcl:
  mvdir
storage/bdb/test/ddscript.tcl:
  mvdir
storage/bdb/test/dead001.tcl:
  mvdir
storage/bdb/test/dead002.tcl:
  mvdir
storage/bdb/test/dead003.tcl:
  mvdir
storage/bdb/test/dead004.tcl:
  mvdir
storage/bdb/test/dead005.tcl:
  mvdir
storage/bdb/test/dead006.tcl:
  mvdir
storage/bdb/test/dead007.tcl:
  mvdir
storage/bdb/test/env001.tcl:
  mvdir
storage/bdb/test/env002.tcl:
  mvdir
storage/bdb/test/env003.tcl:
  mvdir
storage/bdb/test/env004.tcl:
  mvdir
storage/bdb/test/env005.tcl:
  mvdir
storage/bdb/test/env006.tcl:
  mvdir
storage/bdb/test/env007.tcl:
  mvdir
storage/bdb/test/env008.tcl:
  mvdir
storage/bdb/test/env009.tcl:
  mvdir
storage/bdb/test/env010.tcl:
  mvdir
storage/bdb/test/env011.tcl:
  mvdir
storage/bdb/test/hsearch.tcl:
  mvdir
storage/bdb/test/join.tcl:
  mvdir
storage/bdb/test/lock001.tcl:
  mvdir
storage/bdb/test/lock002.tcl:
  mvdir
storage/bdb/test/lock003.tcl:
  mvdir
storage/bdb/test/lock004.tcl:
  mvdir
storage/bdb/test/lock005.tcl:
  mvdir
storage/bdb/test/lockscript.tcl:
  mvdir
storage/bdb/test/log001.tcl:
  mvdir
storage/bdb/test/log002.tcl:
  mvdir
storage/bdb/test/log003.tcl:
  mvdir
storage/bdb/test/log004.tcl:
  mvdir
storage/bdb/test/log005.tcl:
  mvdir
storage/bdb/test/logtrack.tcl:
  mvdir
storage/bdb/test/mdbscript.tcl:
  mvdir
storage/bdb/test/memp001.tcl:
  mvdir
storage/bdb/test/memp002.tcl:
  mvdir
storage/bdb/test/memp003.tcl:
  mvdir
storage/bdb/test/mpoolscript.tcl:
  mvdir
storage/bdb/test/mutex001.tcl:
  mvdir
storage/bdb/test/mutex002.tcl:
  mvdir
storage/bdb/test/mutex003.tcl:
  mvdir
storage/bdb/test/mutexscript.tcl:
  mvdir
storage/bdb/test/ndbm.tcl:
  mvdir
storage/bdb/test/parallel.tcl:
  mvdir
storage/bdb/test/recd001.tcl:
  mvdir
storage/bdb/test/recd002.tcl:
  mvdir
storage/bdb/test/recd003.tcl:
  mvdir
storage/bdb/test/recd004.tcl:
  mvdir
storage/bdb/test/recd005.tcl:
  mvdir
storage/bdb/test/recd006.tcl:
  mvdir
storage/bdb/test/recd007.tcl:
  mvdir
storage/bdb/test/recd008.tcl:
  mvdir
storage/bdb/test/recd009.tcl:
  mvdir
storage/bdb/test/recd010.tcl:
  mvdir
storage/bdb/test/recd011.tcl:
  mvdir
storage/bdb/test/recd012.tcl:
  mvdir
storage/bdb/test/recd013.tcl:
  mvdir
storage/bdb/test/recd014.tcl:
  mvdir
storage/bdb/test/recd015.tcl:
  mvdir
storage/bdb/test/recd016.tcl:
  mvdir
storage/bdb/test/recd017.tcl:
  mvdir
storage/bdb/test/recd018.tcl:
  mvdir
storage/bdb/test/recd019.tcl:
  mvdir
storage/bdb/test/recd020.tcl:
  mvdir
storage/bdb/test/recd15scr.tcl:
  mvdir
storage/bdb/test/recdscript.tcl:
  mvdir
storage/bdb/test/rep001.tcl:
  mvdir
storage/bdb/test/rep002.tcl:
  mvdir
storage/bdb/test/rep003.tcl:
  mvdir
storage/bdb/test/rep004.tcl:
  mvdir
storage/bdb/test/rep005.tcl:
  mvdir
storage/bdb/test/reputils.tcl:
  mvdir
storage/bdb/test/rpc001.tcl:
  mvdir
storage/bdb/test/rpc002.tcl:
  mvdir
storage/bdb/test/rpc003.tcl:
  mvdir
storage/bdb/test/rpc004.tcl:
  mvdir
storage/bdb/test/rpc005.tcl:
  mvdir
storage/bdb/test/rsrc001.tcl:
  mvdir
storage/bdb/test/rsrc002.tcl:
  mvdir
storage/bdb/test/rsrc003.tcl:
  mvdir
storage/bdb/test/rsrc004.tcl:
  mvdir
storage/bdb/test/sdb001.tcl:
  mvdir
storage/bdb/test/sdb002.tcl:
  mvdir
storage/bdb/test/sdb003.tcl:
  mvdir
storage/bdb/test/sdb004.tcl:
  mvdir
storage/bdb/test/sdb005.tcl:
  mvdir
storage/bdb/test/sdb006.tcl:
  mvdir
storage/bdb/test/sdb007.tcl:
  mvdir
storage/bdb/test/sdb008.tcl:
  mvdir
storage/bdb/test/sdb009.tcl:
  mvdir
storage/bdb/test/sdb010.tcl:
  mvdir
storage/bdb/test/sdb011.tcl:
  mvdir
storage/bdb/test/sdb012.tcl:
  mvdir
storage/bdb/test/sdbscript.tcl:
  mvdir
storage/bdb/test/sdbtest001.tcl:
  mvdir
storage/bdb/test/sdbtest002.tcl:
  mvdir
storage/bdb/test/sdbutils.tcl:
  mvdir
storage/bdb/test/sec001.tcl:
  mvdir
storage/bdb/test/sec002.tcl:
  mvdir
storage/bdb/test/shelltest.tcl:
  mvdir
storage/bdb/test/si001.tcl:
  mvdir
storage/bdb/test/si002.tcl:
  mvdir
storage/bdb/test/si003.tcl:
  mvdir
storage/bdb/test/si004.tcl:
  mvdir
storage/bdb/test/si005.tcl:
  mvdir
storage/bdb/test/si006.tcl:
  mvdir
storage/bdb/test/sindex.tcl:
  mvdir
storage/bdb/test/sysscript.tcl:
  mvdir
storage/bdb/test/test.tcl:
  mvdir
storage/bdb/test/test001.tcl:
  mvdir
storage/bdb/test/test002.tcl:
  mvdir
storage/bdb/test/test003.tcl:
  mvdir
storage/bdb/test/test004.tcl:
  mvdir
storage/bdb/test/test005.tcl:
  mvdir
storage/bdb/test/test006.tcl:
  mvdir
storage/bdb/test/test007.tcl:
  mvdir
storage/bdb/test/test008.tcl:
  mvdir
storage/bdb/test/test009.tcl:
  mvdir
storage/bdb/test/test010.tcl:
  mvdir
storage/bdb/test/test011.tcl:
  mvdir
storage/bdb/test/test012.tcl:
  mvdir
storage/bdb/test/test013.tcl:
  mvdir
storage/bdb/test/test014.tcl:
  mvdir
storage/bdb/test/test015.tcl:
  mvdir
storage/bdb/test/test016.tcl:
  mvdir
storage/bdb/test/test017.tcl:
  mvdir
storage/bdb/test/test018.tcl:
  mvdir
storage/bdb/test/test019.tcl:
  mvdir
storage/bdb/test/test020.tcl:
  mvdir
storage/bdb/test/test021.tcl:
  mvdir
storage/bdb/test/test022.tcl:
  mvdir
storage/bdb/test/test023.tcl:
  mvdir
storage/bdb/test/test024.tcl:
  mvdir
storage/bdb/test/test025.tcl:
  mvdir
storage/bdb/test/test026.tcl:
  mvdir
storage/bdb/test/test027.tcl:
  mvdir
storage/bdb/test/test028.tcl:
  mvdir
storage/bdb/test/test029.tcl:
  mvdir
storage/bdb/test/test030.tcl:
  mvdir
storage/bdb/test/test031.tcl:
  mvdir
storage/bdb/test/test032.tcl:
  mvdir
storage/bdb/test/test033.tcl:
  mvdir
storage/bdb/test/test034.tcl:
  mvdir
storage/bdb/test/test035.tcl:
  mvdir
storage/bdb/test/test036.tcl:
  mvdir
storage/bdb/test/test037.tcl:
  mvdir
storage/bdb/test/test038.tcl:
  mvdir
storage/bdb/test/test039.tcl:
  mvdir
storage/bdb/test/test040.tcl:
  mvdir
storage/bdb/test/test041.tcl:
  mvdir
storage/bdb/test/test042.tcl:
  mvdir
storage/bdb/test/test043.tcl:
  mvdir
storage/bdb/test/test044.tcl:
  mvdir
storage/bdb/test/test045.tcl:
  mvdir
storage/bdb/test/test046.tcl:
  mvdir
storage/bdb/test/test047.tcl:
  mvdir
storage/bdb/test/test048.tcl:
  mvdir
storage/bdb/test/test049.tcl:
  mvdir
storage/bdb/test/test050.tcl:
  mvdir
storage/bdb/test/test051.tcl:
  mvdir
storage/bdb/test/test052.tcl:
  mvdir
storage/bdb/test/test053.tcl:
  mvdir
storage/bdb/test/test054.tcl:
  mvdir
storage/bdb/test/test055.tcl:
  mvdir
storage/bdb/test/test056.tcl:
  mvdir
storage/bdb/test/test057.tcl:
  mvdir
storage/bdb/test/test058.tcl:
  mvdir
storage/bdb/test/test059.tcl:
  mvdir
storage/bdb/test/test060.tcl:
  mvdir
storage/bdb/test/test061.tcl:
  mvdir
storage/bdb/test/test062.tcl:
  mvdir
storage/bdb/test/test063.tcl:
  mvdir
storage/bdb/test/test064.tcl:
  mvdir
storage/bdb/test/test065.tcl:
  mvdir
storage/bdb/test/test066.tcl:
  mvdir
storage/bdb/test/test067.tcl:
  mvdir
storage/bdb/test/test068.tcl:
  mvdir
storage/bdb/test/test069.tcl:
  mvdir
storage/bdb/test/test070.tcl:
  mvdir
storage/bdb/test/test071.tcl:
  mvdir
storage/bdb/test/test072.tcl:
  mvdir
storage/bdb/test/test073.tcl:
  mvdir
storage/bdb/test/test074.tcl:
  mvdir
storage/bdb/test/test075.tcl:
  mvdir
storage/bdb/test/test076.tcl:
  mvdir
storage/bdb/test/test077.tcl:
  mvdir
storage/bdb/test/test078.tcl:
  mvdir
storage/bdb/test/test079.tcl:
  mvdir
storage/bdb/test/test080.tcl:
  mvdir
storage/bdb/test/test081.tcl:
  mvdir
storage/bdb/test/test082.tcl:
  mvdir
storage/bdb/test/test083.tcl:
  mvdir
storage/bdb/test/test084.tcl:
  mvdir
storage/bdb/test/test085.tcl:
  mvdir
storage/bdb/test/test086.tcl:
  mvdir
storage/bdb/test/test087.tcl:
  mvdir
storage/bdb/test/test088.tcl:
  mvdir
storage/bdb/test/test089.tcl:
  mvdir
storage/bdb/test/test090.tcl:
  mvdir
storage/bdb/test/test091.tcl:
  mvdir
storage/bdb/test/test092.tcl:
  mvdir
storage/bdb/test/test093.tcl:
  mvdir
storage/bdb/test/test094.tcl:
  mvdir
storage/bdb/test/test095.tcl:
  mvdir
storage/bdb/test/test096.tcl:
  mvdir
storage/bdb/test/test097.tcl:
  mvdir
storage/bdb/test/test098.tcl:
  mvdir
storage/bdb/test/test099.tcl:
  mvdir
storage/bdb/test/test100.tcl:
  mvdir
storage/bdb/test/test101.tcl:
  mvdir
storage/bdb/test/testparams.tcl:
  mvdir
storage/bdb/test/testutils.tcl:
  mvdir
storage/bdb/test/txn001.tcl:
  mvdir
storage/bdb/test/txn002.tcl:
  mvdir
storage/bdb/test/txn003.tcl:
  mvdir
storage/bdb/test/txn004.tcl:
  mvdir
storage/bdb/test/txn005.tcl:
  mvdir
storage/bdb/test/txn006.tcl:
  mvdir
storage/bdb/test/txn007.tcl:
  mvdir
storage/bdb/test/txn008.tcl:
  mvdir
storage/bdb/test/txn009.tcl:
  mvdir
storage/bdb/test/txnscript.tcl:
  mvdir
storage/bdb/test/update.tcl:
  mvdir
storage/bdb/test/scr001/chk.code:
  mvdir
storage/bdb/test/scr002/chk.def:
  mvdir
storage/bdb/test/scr003/chk.define:
  mvdir
storage/bdb/test/scr004/chk.javafiles:
  mvdir
storage/bdb/test/scr005/chk.nl:
  mvdir
storage/bdb/test/scr006/chk.offt:
  mvdir
storage/bdb/test/scr007/chk.proto:
  mvdir
storage/bdb/test/scr008/chk.pubdef:
  mvdir
storage/bdb/test/scr009/chk.srcfiles:
  mvdir
storage/bdb/test/scr010/chk.str:
  mvdir
storage/bdb/test/scr010/spell.ok:
  mvdir
storage/bdb/test/scr011/chk.tags:
  mvdir
storage/bdb/test/scr012/chk.vx_code:
  mvdir
storage/bdb/test/scr013/chk.stats:
  mvdir
storage/bdb/test/scr014/chk.err:
  mvdir
storage/bdb/test/scr015/README:
  mvdir
storage/bdb/test/scr015/TestConstruct01.cpp:
  mvdir
storage/bdb/test/scr015/TestConstruct01.testerr:
  mvdir
storage/bdb/test/scr015/TestConstruct01.testout:
  mvdir
storage/bdb/test/scr015/TestExceptInclude.cpp:
  mvdir
storage/bdb/test/scr015/TestGetSetMethods.cpp:
  mvdir
storage/bdb/test/scr015/TestKeyRange.cpp:
  mvdir
storage/bdb/test/scr015/TestKeyRange.testin:
  mvdir
storage/bdb/test/scr015/TestKeyRange.testout:
  mvdir
storage/bdb/test/upgrade.tcl:
  mvdir
storage/bdb/test/wordlist:
  mvdir
storage/bdb/test/wrap.tcl:
  mvdir
storage/bdb/test/scr015/TestLogc.cpp:
  mvdir
storage/bdb/test/scr015/TestLogc.testout:
  mvdir
storage/bdb/test/scr015/TestSimpleAccess.cpp:
  mvdir
storage/bdb/test/scr015/TestSimpleAccess.testout:
  mvdir
storage/bdb/test/scr015/TestTruncate.cpp:
  mvdir
storage/bdb/test/scr015/TestTruncate.testout:
  mvdir
storage/bdb/test/scr015/chk.cxxtests:
  mvdir
storage/bdb/test/scr015/ignore:
  mvdir
storage/bdb/test/scr015/testall:
  mvdir
storage/bdb/test/scr015/testone:
  mvdir
storage/bdb/test/scr016/CallbackTest.java:
  mvdir
storage/bdb/test/scr016/CallbackTest.testout:
  mvdir
storage/bdb/test/scr016/README:
  mvdir
storage/bdb/test/scr016/TestAppendRecno.java:
  mvdir
storage/bdb/test/scr016/TestAppendRecno.testout:
  mvdir
storage/bdb/test/scr016/TestAssociate.java:
  mvdir
storage/bdb/test/scr016/TestAssociate.testout:
  mvdir
storage/bdb/test/scr016/TestClosedDb.java:
  mvdir
storage/bdb/test/scr016/TestClosedDb.testout:
  mvdir
storage/bdb/test/scr016/TestConstruct01.java:
  mvdir
storage/bdb/test/scr016/TestConstruct01.testerr:
  mvdir
storage/bdb/test/scr016/TestConstruct01.testout:
  mvdir
storage/bdb/test/scr016/TestConstruct02.java:
  mvdir
storage/bdb/test/scr016/TestConstruct02.testout:
  mvdir
storage/bdb/test/scr016/TestDbtFlags.java:
  mvdir
storage/bdb/test/scr016/TestDbtFlags.testerr:
  mvdir
storage/bdb/test/scr016/TestDbtFlags.testout:
  mvdir
storage/bdb/test/scr016/TestGetSetMethods.java:
  mvdir
storage/bdb/test/scr016/TestKeyRange.java:
  mvdir
storage/bdb/test/scr016/TestKeyRange.testout:
  mvdir
storage/bdb/test/scr016/TestLockVec.java:
  mvdir
storage/bdb/test/scr016/TestLockVec.testout:
  mvdir
storage/bdb/test/scr016/TestLogc.java:
  mvdir
storage/bdb/test/scr016/TestLogc.testout:
  mvdir
storage/bdb/test/scr016/TestOpenEmpty.java:
  mvdir
storage/bdb/test/scr016/TestOpenEmpty.testerr:
  mvdir
storage/bdb/test/scr016/TestReplication.java:
  mvdir
storage/bdb/test/scr016/TestRpcServer.java:
  mvdir
storage/bdb/test/scr016/TestSameDbt.java:
  mvdir
storage/bdb/test/scr016/TestSameDbt.testout:
  mvdir
storage/bdb/test/scr016/TestSimpleAccess.java:
  mvdir
storage/bdb/test/scr016/TestSimpleAccess.testout:
  mvdir
storage/bdb/test/scr016/TestStat.java:
  mvdir
storage/bdb/test/scr016/TestStat.testout:
  mvdir
storage/bdb/test/scr016/TestTruncate.java:
  mvdir
storage/bdb/test/scr016/TestTruncate.testout:
  mvdir
storage/bdb/test/scr016/TestUtil.java:
  mvdir
storage/bdb/test/scr016/TestXAServlet.java:
  mvdir
storage/bdb/test/scr016/chk.javatests:
  mvdir
storage/bdb/test/scr016/ignore:
  mvdir
storage/bdb/test/scr016/testall:
  mvdir
storage/bdb/test/scr016/testone:
  mvdir
storage/bdb/test/scr017/O.BH:
  mvdir
storage/bdb/test/scr017/O.R:
  mvdir
storage/bdb/test/scr017/chk.db185:
  mvdir
storage/bdb/test/scr017/t.c:
  mvdir
storage/bdb/test/scr018/chk.comma:
  mvdir
storage/bdb/test/scr018/t.c:
  mvdir
storage/bdb/test/scr019/chk.include:
  mvdir
storage/bdb/test/scr020/chk.inc:
  mvdir
storage/bdb/test/scr021/chk.flags:
  mvdir
storage/bdb/test/scr022/chk.rr:
  mvdir
storage/bdb/txn/txn.c:
  mvdir
storage/bdb/txn/txn.src:
  mvdir
storage/bdb/txn/txn_method.c:
  mvdir
storage/bdb/txn/txn_rec.c:
  mvdir
storage/bdb/txn/txn_recover.c:
  mvdir
storage/bdb/txn/txn_region.c:
  mvdir
storage/bdb/txn/txn_stat.c:
  mvdir
storage/bdb/txn/txn_util.c:
  mvdir
storage/bdb/xa/xa.c:
  mvdir
storage/bdb/xa/xa_db.c:
  mvdir
storage/bdb/xa/xa_map.c:
  mvdir

36 files changed, 0 insertions, 9761 deletions

diff --git a/bdb/dbinc/btree.h b/bdb/dbinc/btree.h
deleted file mode 100644
index 54da9c5b208..00000000000
--- a/bdb/dbinc/btree.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- */
-/*
- * Copyright (c) 1990, 1993, 1994, 1995, 1996
- *	Keith Bostic.  All rights reserved.
- */
-/*
- * Copyright (c) 1990, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: btree.h,v 11.45 2002/08/06 06:11:21 bostic Exp $
- */
-#ifndef	_DB_BTREE_H_
-#define	_DB_BTREE_H_
-
-/* Forward structure declarations. */
-struct __btree;		typedef struct __btree BTREE;
-struct __cursor;	typedef struct __cursor BTREE_CURSOR;
-struct __epg;		typedef struct __epg EPG;
-struct __recno;		typedef struct __recno RECNO;
-
-#define	DEFMINKEYPAGE	 (2)
-
-/*
- * A recno order of 0 indicates that we don't have an order, not that we've
- * an order less than 1.
- */
-#define	INVALID_ORDER	0
-
-#define	ISINTERNAL(p)	(TYPE(p) == P_IBTREE || TYPE(p) == P_IRECNO)
-#define	ISLEAF(p)	(TYPE(p) == P_LBTREE ||				\
-			    TYPE(p) == P_LRECNO || TYPE(p) == P_LDUP)
-
-/* Flags for __bam_cadjust_log(). */
-#define	CAD_UPDATEROOT	0x01		/* Root page count was updated. */
-
-/* Flags for __bam_split_log(). */
-#define	SPL_NRECS	0x01		/* Split tree has record count. */
-
-/* Flags for __bam_iitem(). */
-#define	BI_DELETED	0x01		/* Key/data pair only placeholder. */
-
-/* Flags for __bam_stkrel(). */
-#define	STK_CLRDBC	0x01		/* Clear dbc->page reference. */
-#define	STK_NOLOCK	0x02		/* Don't retain locks. */
-
-/* Flags for __ram_ca(). These get logged, so make the values explicit. */
-typedef enum {
-	CA_DELETE = 0,			/* Delete the current record. */
-	CA_IAFTER = 1,			/* Insert before the current record. */
-	CA_IBEFORE = 2,			/* Insert after the current record. */
-	CA_ICURRENT = 3			/* Overwrite the current record. */
-} ca_recno_arg;
-
-/*
- * Flags for __bam_search() and __bam_rsearch().
- *
- * Note, internal page searches must find the largest record less than key in
- * the tree so that descents work.  Leaf page searches must find the smallest
- * record greater than key so that the returned index is the record's correct
- * position for insertion.
- *
- * The flags parameter to the search routines describes three aspects of the
- * search: the type of locking required (including if we're locking a pair of
- * pages), the item to return in the presence of duplicates and whether or not
- * to return deleted entries.  To simplify both the mnemonic representation
- * and the code that checks for various cases, we construct a set of bitmasks.
- */
-#define	S_READ		0x00001		/* Read locks. */
-#define	S_WRITE		0x00002		/* Write locks. */
-
-#define	S_APPEND	0x00040		/* Append to the tree. */
-#define	S_DELNO		0x00080		/* Don't return deleted items. */
-#define	S_DUPFIRST	0x00100		/* Return first duplicate. */
-#define	S_DUPLAST	0x00200		/* Return last duplicate. */
-#define	S_EXACT		0x00400		/* Exact items only. */
-#define	S_PARENT	0x00800		/* Lock page pair. */
-#define	S_STACK		0x01000		/* Need a complete stack. */
-#define	S_PAST_EOF	0x02000		/* If doing insert search (or keyfirst
-					 * or keylast operations), or a split
-					 * on behalf of an insert, it's okay to
-					 * return an entry one past end-of-page.
-					 */
-#define	S_STK_ONLY	0x04000		/* Just return info in the stack */
-
-#define	S_DELETE	(S_WRITE | S_DUPFIRST | S_DELNO | S_EXACT | S_STACK)
-#define	S_FIND		(S_READ | S_DUPFIRST | S_DELNO)
-#define	S_FIND_WR	(S_WRITE | S_DUPFIRST | S_DELNO)
-#define	S_INSERT	(S_WRITE | S_DUPLAST | S_PAST_EOF | S_STACK)
-#define	S_KEYFIRST	(S_WRITE | S_DUPFIRST | S_PAST_EOF | S_STACK)
-#define	S_KEYLAST	(S_WRITE | S_DUPLAST | S_PAST_EOF | S_STACK)
-#define	S_WRPAIR	(S_WRITE | S_DUPLAST | S_PAST_EOF | S_PARENT)
-
-/*
- * Various routines pass around page references.  A page reference is
- * a pointer to the page, and the indx indicates an item on the page.
- * Each page reference may include a lock.
- */
-struct __epg {
-	PAGE	     *page;		/* The page. */
-	db_indx_t     indx;		/* The index on the page. */
-	db_indx_t     entries;		/* The number of entries on page */
-	DB_LOCK	      lock;		/* The page's lock. */
-	db_lockmode_t lock_mode;	/* The lock mode. */
-};
-
-/*
- * We maintain a stack of the pages that we're locking in the tree.  Grow
- * the stack as necessary.
- *
- * XXX
- * Temporary fix for #3243 -- clear the page and lock from the stack entry.
- * The correct fix is to never release a stack that doesn't hold items.
- */
-#define	BT_STK_CLR(c) do {						\
-	(c)->csp = (c)->sp;						\
-	(c)->csp->page = NULL;						\
-	LOCK_INIT((c)->csp->lock);				\
-} while (0)
-
-#define	BT_STK_ENTER(dbenv, c, pagep, page_indx, l, mode, ret) do {	\
-	if ((ret =							\
-	    (c)->csp == (c)->esp ? __bam_stkgrow(dbenv, c) : 0) == 0) {	\
-		(c)->csp->page = pagep;					\
-		(c)->csp->indx = page_indx;				\
-		(c)->csp->entries = NUM_ENT(pagep);			\
-		(c)->csp->lock = l;					\
-		(c)->csp->lock_mode = mode;				\
-	}								\
-} while (0)
-
-#define	BT_STK_PUSH(dbenv, c, pagep, page_indx, lock, mode, ret) do {	\
-	BT_STK_ENTER(dbenv, c, pagep, page_indx, lock, mode, ret);	\
-	++(c)->csp;							\
-} while (0)
-
-#define	BT_STK_NUM(dbenv, c, pagep, page_indx, ret) do {		\
-	if ((ret =							\
-	    (c)->csp == (c)->esp ? __bam_stkgrow(dbenv, c) : 0) == 0) {	\
-		(c)->csp->page = NULL;					\
-		(c)->csp->indx = page_indx;				\
-		(c)->csp->entries = NUM_ENT(pagep);			\
-		LOCK_INIT((c)->csp->lock);			\
-		(c)->csp->lock_mode = DB_LOCK_NG;			\
-	}								\
-} while (0)
-
-#define	BT_STK_NUMPUSH(dbenv, c, pagep, page_indx, ret) do {		\
-	BT_STK_NUM(dbenv, cp, pagep, page_indx, ret);			\
-	++(c)->csp;							\
-} while (0)
-
-#define	BT_STK_POP(c)							\
-	((c)->csp == (c)->sp ? NULL : --(c)->csp)
-
-/* Btree/Recno cursor. */
-struct __cursor {
-	/* struct __dbc_internal */
-	__DBC_INTERNAL
-
-	/* btree private part */
-	EPG		*sp;		/* Stack pointer. */
-	EPG		*csp;		/* Current stack entry. */
-	EPG		*esp;		/* End stack pointer. */
-	EPG		 stack[5];
-
-	db_indx_t	 ovflsize;	/* Maximum key/data on-page size. */
-
-	db_recno_t	 recno;		/* Current record number. */
-	u_int32_t	 order;		/* Relative order among deleted curs. */
-
-	/*
-	 * Btree:
-	 * We set a flag in the cursor structure if the underlying object has
-	 * been deleted.  It's not strictly necessary, we could get the same
-	 * information by looking at the page itself, but this method doesn't
-	 * require us to retrieve the page on cursor delete.
-	 *
-	 * Recno:
-	 * When renumbering recno databases during deletes, cursors referencing
-	 * "deleted" records end up positioned between two records, and so must
-	 * be specially adjusted on the next operation.
-	 */
-#define	C_DELETED	0x0001		/* Record was deleted. */
-	/*
-	 * There are three tree types that require maintaining record numbers.
-	 * Recno AM trees, Btree AM trees for which the DB_RECNUM flag was set,
-	 * and Btree off-page duplicate trees.
-	 */
-#define	C_RECNUM	0x0002		/* Tree requires record counts. */
-	/*
-	 * Recno trees have immutable record numbers by default, but optionally
-	 * support mutable record numbers.  Off-page duplicate Recno trees have
-	 * mutable record numbers.  All Btrees with record numbers (including
-	 * off-page duplicate trees) are mutable by design, no flag is needed.
-	 */
-#define	C_RENUMBER	0x0004		/* Tree records are mutable. */
-	u_int32_t	 flags;
-};
-
-/*
- * Threshhold value, as a function of bt_minkey, of the number of
- * bytes a key/data pair can use before being placed on an overflow
- * page.  Assume every item requires the maximum alignment for
- * padding, out of sheer paranoia.
- */
-#define	B_MINKEY_TO_OVFLSIZE(dbp, minkey, pgsize)			\
-	((u_int16_t)(((pgsize) - P_OVERHEAD(dbp)) / ((minkey) * P_INDX) -\
-	    (BKEYDATA_PSIZE(0) + ALIGN(1, sizeof(int32_t)))))
-
-/*
- * The maximum space that a single item can ever take up on one page.
- * Used by __bam_split to determine whether a split is still necessary.
- */
-#define	B_MAX(a,b)	(((a) > (b)) ? (a) : (b))
-#define	B_MAXSIZEONPAGE(ovflsize)					\
-	(B_MAX(BOVERFLOW_PSIZE, BKEYDATA_PSIZE(ovflsize)))
-
-/*
- * The in-memory, per-tree btree/recno data structure.
- */
-struct __btree {			/* Btree access method. */
-	/*
-	 * !!!
-	 * These fields are write-once (when the structure is created) and
-	 * so are ignored as far as multi-threading is concerned.
-	 */
-	db_pgno_t bt_meta;		/* Database meta-data page. */
-	db_pgno_t bt_root;		/* Database root page. */
-
-	u_int32_t bt_maxkey;		/* Maximum keys per page. */
-	u_int32_t bt_minkey;		/* Minimum keys per page. */
-
-					/* Btree comparison function. */
-	int (*bt_compare) __P((DB *, const DBT *, const DBT *));
-					/* Btree prefix function. */
-	size_t (*bt_prefix) __P((DB *, const DBT *, const DBT *));
-
-					/* Recno access method. */
-	int	  re_pad;		/* Fixed-length padding byte. */
-	int	  re_delim;		/* Variable-length delimiting byte. */
-	u_int32_t re_len;		/* Length for fixed-length records. */
-	char	 *re_source;		/* Source file name. */
-
-	/*
-	 * !!!
-	 * The bt_lpgno field is NOT protected by any mutex, and for this
-	 * reason must be advisory only, so, while it is read/written by
-	 * multiple threads, DB is completely indifferent to the quality
-	 * of its information.
-	 */
-	db_pgno_t bt_lpgno;		/* Last insert location. */
-
-	/*
-	 * !!!
-	 * The re_modified field is NOT protected by any mutex, and for this
-	 * reason cannot be anything more complicated than a zero/non-zero
-	 * value.  The actual writing of the backing source file cannot be
-	 * threaded, so clearing the flag isn't a problem.
-	 */
-	int	  re_modified;		/* If the tree was modified. */
-
-	/*
-	 * !!!
-	 * These fields are ignored as far as multi-threading is concerned.
-	 * There are no transaction semantics associated with backing files,
-	 * nor is there any thread protection.
-	 */
-	FILE		*re_fp;		/* Source file handle. */
-	int		 re_eof;	/* Backing source file EOF reached. */
-	db_recno_t	 re_last;	/* Last record number read. */
-};
-
-/*
- * Modes for the __bam_curadj recovery records (btree_curadj).
- * These appear in log records, so we wire the values and
- * do not leave it up to the compiler.
- */
-typedef enum {
-	DB_CA_DI	= 1,
-	DB_CA_DUP	= 2,
-	DB_CA_RSPLIT	= 3,
-	DB_CA_SPLIT	= 4
-} db_ca_mode;
-
-#include "dbinc_auto/btree_auto.h"
-#include "dbinc_auto/btree_ext.h"
-#include "dbinc/db_am.h"
-#endif /* !_DB_BTREE_H_ */
diff --git a/bdb/dbinc/crypto.h b/bdb/dbinc/crypto.h
deleted file mode 100644
index 92fad098a4a..00000000000
--- a/bdb/dbinc/crypto.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: crypto.h,v 1.9 2002/08/06 06:37:07 bostic Exp $
- */
-
-#ifndef	_DB_CRYPTO_H_
-#define	_DB_CRYPTO_H_
-
-/*
- * !!!
- * These are the internal representations of the algorithm flags.
- * They are used in both the DB_CIPHER structure and the CIPHER
- * structure so we can tell if users specified both passwd and alg
- * correctly.
- *
- * CIPHER_ANY is used when an app joins an existing env but doesn't
- * know the algorithm originally used.  This is only valid in the
- * DB_CIPHER structure until we open and can set the alg.
- */
-/*
- * We store the algorithm in an 8-bit field on the meta-page.  So we
- * use a numeric value, not bit fields.
- * now we are limited to 8 algorithms before we cannot use bits and
- * need numeric values.  That should be plenty.  It is okay for the
- * CIPHER_ANY flag to go beyond that since that is never stored on disk.
- */
-
-/*
- * This structure is per-process, not in shared memory.
- */
-struct __db_cipher {
-	int	(*adj_size) __P((size_t));
-	int	(*close) __P((DB_ENV *, void *));
-	int	(*decrypt) __P((DB_ENV *, void *, void *, u_int8_t *, size_t));
-	int	(*encrypt) __P((DB_ENV *, void *, void *, u_int8_t *, size_t));
-	int	(*init) __P((DB_ENV *, DB_CIPHER *));
-
-	u_int8_t mac_key[DB_MAC_KEY];	/* MAC key. */
-	void	*data;			/* Algorithm-specific information */
-
-#define	CIPHER_AES	1		/* AES algorithm */
-	u_int8_t	alg;		/* Algorithm used - See above */
-	u_int8_t	spare[3];	/* Spares */
-
-#define	CIPHER_ANY	0x00000001	/* Only for DB_CIPHER */
-	u_int32_t	flags;		/* Other flags */
-};
-
-#ifdef HAVE_CRYPTO
-
-#include "crypto/rijndael/rijndael-api-fst.h"
-
-/*
- * Shared ciphering structure
- * No DB_MUTEX needed because all information is read-only after creation.
- */
-typedef struct __cipher {
-	roff_t		passwd;		/* Offset to shared passwd */
-	size_t		passwd_len;	/* Length of passwd */
-	u_int32_t	flags;		/* Algorithm used - see above */
-} CIPHER;
-
-#define	DB_AES_KEYLEN	128	/* AES key length */
-#define	DB_AES_CHUNK	16	/* AES byte unit size */
-
-typedef struct __aes_cipher {
-	keyInstance	decrypt_ki;	/* Decryption key instance */
-	keyInstance	encrypt_ki;	/* Encryption key instance */
-	u_int32_t	flags;		/* AES-specific flags */
-} AES_CIPHER;
-
-#include "dbinc_auto/crypto_ext.h"
-#endif /* HAVE_CRYPTO */
-#endif /* !_DB_CRYPTO_H_ */
diff --git a/bdb/dbinc/cxx_common.h b/bdb/dbinc/cxx_common.h
deleted file mode 100644
index e5cb3a9aef4..00000000000
--- a/bdb/dbinc/cxx_common.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1997-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: cxx_common.h,v 11.2 2002/01/11 15:52:23 bostic Exp $
- */
-
-#ifndef _CXX_COMMON_H_
-#define	_CXX_COMMON_H_
-
-//
-// Common definitions used by all of Berkeley DB's C++ include files.
-//
-
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-//
-// Mechanisms for declaring classes
-//
-
-//
-// Every class defined in this file has an _exported next to the class name.
-// This is needed for WinTel machines so that the class methods can
-// be exported or imported in a DLL as appropriate.  Users of the DLL
-// use the define DB_USE_DLL.  When the DLL is built, DB_CREATE_DLL
-// must be defined.
-//
-#if defined(_MSC_VER)
-
-#  if defined(DB_CREATE_DLL)
-#    define _exported __declspec(dllexport)      // creator of dll
-#  elif defined(DB_USE_DLL)
-#    define _exported __declspec(dllimport)      // user of dll
-#  else
-#    define _exported                            // static lib creator or user
-#  endif
-
-#else /* _MSC_VER */
-
-#  define _exported
-
-#endif /* _MSC_VER */
-#endif /* !_CXX_COMMON_H_ */
diff --git a/bdb/dbinc/cxx_except.h b/bdb/dbinc/cxx_except.h
deleted file mode 100644
index f9bf4f859f8..00000000000
--- a/bdb/dbinc/cxx_except.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1997-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: cxx_except.h,v 11.5 2002/08/01 23:32:34 mjc Exp $
- */
-
-#ifndef _CXX_EXCEPT_H_
-#define	_CXX_EXCEPT_H_
-
-#include "cxx_common.h"
-
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-//
-// Forward declarations
-//
-
-class DbDeadlockException;                       // forward
-class DbException;                               // forward
-class DbLockNotGrantedException;                 // forward
-class DbLock;                                    // forward
-class DbMemoryException;                         // forward
-class DbRunRecoveryException;                    // forward
-class Dbt;                                       // forward
-
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-//
-// Exception classes
-//
-
-// Almost any error in the DB library throws a DbException.
-// Every exception should be considered an abnormality
-// (e.g. bug, misuse of DB, file system error).
-//
-// NOTE: We would like to inherit from class exception and
-//       let it handle what(), but there are
-//       MSVC++ problems when <exception> is included.
-//
-class _exported DbException
-{
-public:
-	virtual ~DbException();
-	DbException(int err);
-	DbException(const char *description);
-	DbException(const char *prefix, int err);
-	DbException(const char *prefix1, const char *prefix2, int err);
-	int get_errno() const;
-	virtual const char *what() const;
-
-	DbException(const DbException &);
-	DbException &operator = (const DbException &);
-
-private:
-	char *what_;
-	int err_;                   // errno
-};
-
-//
-// A specific sort of exception that occurs when
-// an operation is aborted to resolve a deadlock.
-//
-class _exported DbDeadlockException : public DbException
-{
-public:
-	virtual ~DbDeadlockException();
-	DbDeadlockException(const char *description);
-
-	DbDeadlockException(const DbDeadlockException &);
-	DbDeadlockException &operator = (const DbDeadlockException &);
-};
-
-//
-// A specific sort of exception that occurs when
-// a lock is not granted, e.g. by lock_get or lock_vec.
-// Note that the Dbt is only live as long as the Dbt used
-// in the offending call.
-//
-class _exported DbLockNotGrantedException : public DbException
-{
-public:
-	virtual ~DbLockNotGrantedException();
-	DbLockNotGrantedException(const char *prefix, db_lockop_t op,
-	    db_lockmode_t mode, const Dbt *obj, const DbLock lock, int index);
-	DbLockNotGrantedException(const DbLockNotGrantedException &);
-	DbLockNotGrantedException &operator =
-	    (const DbLockNotGrantedException &);
-
-	db_lockop_t get_op() const;
-	db_lockmode_t get_mode() const;
-	const Dbt* get_obj() const;
-	DbLock *get_lock() const;
-	int get_index() const;
-
-private:
-	db_lockop_t op_;
-	db_lockmode_t mode_;
-	const Dbt *obj_;
-	DbLock *lock_;
-	int index_;
-};
-
-//
-// A specific sort of exception that occurs when
-// user declared memory is insufficient in a Dbt.
-//
-class _exported DbMemoryException : public DbException
-{
-public:
-	virtual ~DbMemoryException();
-	DbMemoryException(Dbt *dbt);
-	DbMemoryException(const char *description);
-	DbMemoryException(const char *prefix, Dbt *dbt);
-	DbMemoryException(const char *prefix1, const char *prefix2, Dbt *dbt);
-	Dbt *get_dbt() const;
-
-	DbMemoryException(const DbMemoryException &);
-	DbMemoryException &operator = (const DbMemoryException &);
-
-private:
-	Dbt *dbt_;
-};
-
-//
-// A specific sort of exception that occurs when
-// recovery is required before continuing DB activity.
-//
-class _exported DbRunRecoveryException : public DbException
-{
-public:
-	virtual ~DbRunRecoveryException();
-	DbRunRecoveryException(const char *description);
-
-	DbRunRecoveryException(const DbRunRecoveryException &);
-	DbRunRecoveryException &operator = (const DbRunRecoveryException &);
-};
-
-#endif /* !_CXX_EXCEPT_H_ */
diff --git a/bdb/dbinc/cxx_int.h b/bdb/dbinc/cxx_int.h
deleted file mode 100644
index 9af3979d9f1..00000000000
--- a/bdb/dbinc/cxx_int.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1997-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: cxx_int.h,v 11.20 2002/01/11 15:52:23 bostic Exp $
- */
-
-#ifndef _CXX_INT_H_
-#define	_CXX_INT_H_
-
-// private data structures known to the implementation only
-
-//
-// Using FooImp classes will allow the implementation to change in the
-// future without any modification to user code or even to header files
-// that the user includes. FooImp * is just like void * except that it
-// provides a little extra protection, since you cannot randomly assign
-// any old pointer to a FooImp* as you can with void *.  Currently, a
-// pointer to such an opaque class is always just a pointer to the
-// appropriate underlying implementation struct.  These are converted
-// back and forth using the various overloaded wrap()/unwrap() methods.
-// This is essentially a use of the "Bridge" Design Pattern.
-//
-// WRAPPED_CLASS implements the appropriate wrap() and unwrap() methods
-// for a wrapper class that has an underlying pointer representation.
-//
-#define	WRAPPED_CLASS(_WRAPPER_CLASS, _IMP_CLASS, _WRAPPED_TYPE)           \
-									   \
-	class _IMP_CLASS {};                                               \
-									   \
-	inline _WRAPPED_TYPE unwrap(_WRAPPER_CLASS *val)                   \
-	{                                                                  \
-		if (!val) return (0);                                      \
-		return ((_WRAPPED_TYPE)((void *)(val->imp())));            \
-	}                                                                  \
-									   \
-	inline const _WRAPPED_TYPE unwrapConst(const _WRAPPER_CLASS *val)  \
-	{                                                                  \
-		if (!val) return (0);                                      \
-		return ((const _WRAPPED_TYPE)((void *)(val->constimp()))); \
-	}                                                                  \
-									   \
-	inline _IMP_CLASS *wrap(_WRAPPED_TYPE val)                         \
-	{                                                                  \
-		return ((_IMP_CLASS*)((void *)val));                       \
-	}
-
-WRAPPED_CLASS(DbMpoolFile, DbMpoolFileImp, DB_MPOOLFILE*)
-WRAPPED_CLASS(Db, DbImp, DB*)
-WRAPPED_CLASS(DbEnv, DbEnvImp, DB_ENV*)
-WRAPPED_CLASS(DbTxn, DbTxnImp, DB_TXN*)
-
-// A tristate integer value used by the DB_ERROR macro below.
-// We chose not to make this an enumerated type so it can
-// be kept private, even though methods that return the
-// tristate int can be declared in db_cxx.h .
-//
-#define	ON_ERROR_THROW     1
-#define	ON_ERROR_RETURN    0
-#define	ON_ERROR_UNKNOWN   (-1)
-
-// Macros that handle detected errors, in case we want to
-// change the default behavior.  The 'policy' is one of
-// the tristate values given above.  If UNKNOWN is specified,
-// the behavior is taken from the last initialized DbEnv.
-//
-#define	DB_ERROR(caller, ecode, policy) \
-    DbEnv::runtime_error(caller, ecode, policy)
-
-#define	DB_ERROR_DBT(caller, dbt, policy) \
-    DbEnv::runtime_error_dbt(caller, dbt, policy)
-
-#define	DB_OVERFLOWED_DBT(dbt) \
-	(F_ISSET(dbt, DB_DBT_USERMEM) && dbt->size > dbt->ulen)
-
-/* values for Db::flags_ */
-#define	DB_CXX_PRIVATE_ENV      0x00000001
-
-#endif /* !_CXX_INT_H_ */
diff --git a/bdb/dbinc/db.in b/bdb/dbinc/db.in
deleted file mode 100644
index 208de3bd622..00000000000
--- a/bdb/dbinc/db.in
+++ /dev/null
@@ -1,1883 +0,0 @@
-/*
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: db.in,v 11.323 2002/09/03 17:27:16 bostic Exp $
- *
- * db.h include file layout:
- *	General.
- *	Database Environment.
- *	Locking subsystem.
- *	Logging subsystem.
- *	Shared buffer cache (mpool) subsystem.
- *	Transaction subsystem.
- *	Access methods.
- *	Access method cursors.
- *	Dbm/Ndbm, Hsearch historic interfaces.
- */
-
-#ifndef _DB_H_
-#define	_DB_H_
-
-#ifndef __NO_SYSTEM_INCLUDES
-#include <sys/types.h>
-
-#include <stdio.h>
-#endif
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- * XXX
- * Handle function prototypes and the keyword "const".  This steps on name
- * space that DB doesn't control, but all of the other solutions are worse.
- *
- * XXX
- * While Microsoft's compiler is ANSI C compliant, it doesn't have _STDC_
- * defined by default, you specify a command line flag or #pragma to turn
- * it on.  Don't do that, however, because some of Microsoft's own header
- * files won't compile.
- */
-#undef	__P
-#if defined(__STDC__) || defined(__cplusplus) || defined(_MSC_VER)
-#define	__P(protos)	protos		/* ANSI C prototypes */
-#else
-#define	const
-#define	__P(protos)	()		/* K&R C preprocessor */
-#endif
-
-/*
- * Berkeley DB version information.
- */
-#define	DB_VERSION_MAJOR	@DB_VERSION_MAJOR@
-#define	DB_VERSION_MINOR	@DB_VERSION_MINOR@
-#define	DB_VERSION_PATCH	@DB_VERSION_PATCH@
-#define	DB_VERSION_STRING	@DB_VERSION_STRING@
-
-/*
- * !!!
- * Berkeley DB uses specifically sized types.  If they're not provided by
- * the system, typedef them here.
- *
- * We protect them against multiple inclusion using __BIT_TYPES_DEFINED__,
- * as does BIND and Kerberos, since we don't know for sure what #include
- * files the user is using.
- *
- * !!!
- * We also provide the standard u_int, u_long etc., if they're not provided
- * by the system.
- */
-#ifndef	__BIT_TYPES_DEFINED__
-#define	__BIT_TYPES_DEFINED__
-@u_int8_decl@
-@int16_decl@
-@u_int16_decl@
-@int32_decl@
-@u_int32_decl@
-#endif
-
-@u_char_decl@
-@u_short_decl@
-@u_int_decl@
-@u_long_decl@
-@ssize_t_decl@
-
-/* Basic types that are exported or quasi-exported. */
-typedef	u_int32_t	db_pgno_t;	/* Page number type. */
-typedef	u_int16_t	db_indx_t;	/* Page offset type. */
-#define	DB_MAX_PAGES	0xffffffff	/* >= # of pages in a file */
-
-typedef	u_int32_t	db_recno_t;	/* Record number type. */
-#define	DB_MAX_RECORDS	0xffffffff	/* >= # of records in a tree */
-
-typedef u_int32_t	db_timeout_t;	/* Type of a timeout. */
-
-/*
- * Region offsets are currently limited to 32-bits.  I expect that's going
- * to have to be fixed in the not-too-distant future, since we won't want to
- * split 100Gb memory pools into that many different regions.
- */
-typedef u_int32_t roff_t;
-
-/*
- * Forward structure declarations, so we can declare pointers and
- * applications can get type checking.
- */
-struct __db;		typedef struct __db DB;
-struct __db_bt_stat;	typedef struct __db_bt_stat DB_BTREE_STAT;
-struct __db_cipher;	typedef struct __db_cipher DB_CIPHER;
-struct __db_dbt;	typedef struct __db_dbt DBT;
-struct __db_env;	typedef struct __db_env DB_ENV;
-struct __db_h_stat;	typedef struct __db_h_stat DB_HASH_STAT;
-struct __db_ilock;	typedef struct __db_ilock DB_LOCK_ILOCK;
-struct __db_lock_stat;	typedef struct __db_lock_stat DB_LOCK_STAT;
-struct __db_lock_u;	typedef struct __db_lock_u DB_LOCK;
-struct __db_lockreq;	typedef struct __db_lockreq DB_LOCKREQ;
-struct __db_log_cursor;	typedef struct __db_log_cursor DB_LOGC;
-struct __db_log_stat;	typedef struct __db_log_stat DB_LOG_STAT;
-struct __db_lsn;	typedef struct __db_lsn DB_LSN;
-struct __db_mpool;	typedef struct __db_mpool DB_MPOOL;
-struct __db_mpool_fstat;typedef struct __db_mpool_fstat DB_MPOOL_FSTAT;
-struct __db_mpool_stat;	typedef struct __db_mpool_stat DB_MPOOL_STAT;
-struct __db_mpoolfile;	typedef struct __db_mpoolfile DB_MPOOLFILE;
-struct __db_preplist;	typedef struct __db_preplist DB_PREPLIST;
-struct __db_qam_stat;	typedef struct __db_qam_stat DB_QUEUE_STAT;
-struct __db_rep;	typedef struct __db_rep DB_REP;
-struct __db_rep_stat;	typedef struct __db_rep_stat DB_REP_STAT;
-struct __db_txn;	typedef struct __db_txn DB_TXN;
-struct __db_txn_active;	typedef struct __db_txn_active DB_TXN_ACTIVE;
-struct __db_txn_stat;	typedef struct __db_txn_stat DB_TXN_STAT;
-struct __db_txnmgr;	typedef struct __db_txnmgr DB_TXNMGR;
-struct __dbc;		typedef struct __dbc DBC;
-struct __dbc_internal;	typedef struct __dbc_internal DBC_INTERNAL;
-struct __fh_t;		typedef struct __fh_t DB_FH;
-struct __fname;		typedef struct __fname FNAME;
-struct __key_range;	typedef struct __key_range DB_KEY_RANGE;
-struct __mpoolfile;	typedef struct __mpoolfile MPOOLFILE;
-struct __mutex_t;	typedef struct __mutex_t DB_MUTEX;
-
-/* Key/data structure -- a Data-Base Thang. */
-struct __db_dbt {
-	/*
-	 * data/size must be fields 1 and 2 for DB 1.85 compatibility.
-	 */
-	void	 *data;			/* Key/data */
-	u_int32_t size;			/* key/data length */
-
-	u_int32_t ulen;			/* RO: length of user buffer. */
-	u_int32_t dlen;			/* RO: get/put record length. */
-	u_int32_t doff;			/* RO: get/put record offset. */
-
-	void	*app_private;		/* Application-private handle. */
-
-#define	DB_DBT_APPMALLOC	0x001	/* Callback allocated memory. */
-#define	DB_DBT_ISSET		0x002	/* Lower level calls set value. */
-#define	DB_DBT_MALLOC		0x004	/* Return in malloc'd memory. */
-#define	DB_DBT_PARTIAL		0x008	/* Partial put/get. */
-#define	DB_DBT_REALLOC		0x010	/* Return in realloc'd memory. */
-#define	DB_DBT_USERMEM		0x020	/* Return in user's memory. */
-#define	DB_DBT_DUPOK		0x040	/* Insert if duplicate. */
-	u_int32_t flags;
-};
-
-/*
- * Common flags --
- *	Interfaces which use any of these common flags should never have
- *	interface specific flags in this range.
- */
-#define	DB_CREATE	      0x000001	/* Create file as necessary. */
-#define	DB_CXX_NO_EXCEPTIONS  0x000002	/* C++: return error values. */
-#define	DB_FORCE	      0x000004	/* Force (anything). */
-#define	DB_NOMMAP	      0x000008	/* Don't mmap underlying file. */
-#define	DB_RDONLY	      0x000010	/* Read-only (O_RDONLY). */
-#define	DB_RECOVER	      0x000020	/* Run normal recovery. */
-#define	DB_THREAD	      0x000040	/* Applications are threaded. */
-#define	DB_TRUNCATE	      0x000080	/* Discard existing DB (O_TRUNC). */
-#define	DB_TXN_NOSYNC	      0x000100	/* Do not sync log on commit. */
-#define	DB_USE_ENVIRON	      0x000200	/* Use the environment. */
-#define	DB_USE_ENVIRON_ROOT   0x000400	/* Use the environment if root. */
-
-/*
- * Common flags --
- *	Interfaces which use any of these common flags should never have
- *	interface specific flags in this range.
- *
- * DB_AUTO_COMMIT:
- *	DB_ENV->set_flags, DB->associate, DB->del, DB->put, DB->open,
- *	DB->remove, DB->rename, DB->truncate
- * DB_DIRTY_READ:
- *	DB->cursor, DB->get, DB->join, DB->open, DBcursor->c_get,
- *	DB_ENV->txn_begin
- *
- *	   Shared flags up to 0x000400 */
-#define	DB_AUTO_COMMIT	    0x00800000	/* Implied transaction. */
-#define	DB_DIRTY_READ	    0x01000000	/* Dirty Read. */
-
-/*
- * Flags private to db_env_create.
- */
-#define	DB_CLIENT	      0x000001	/* Open for a client environment. */
-
-/*
- * Flags private to db_create.
- */
-#define	DB_XA_CREATE	      0x000001	/* Open in an XA environment. */
-
-/*
- * Flags private to DB_ENV->open.
- *	   Shared flags up to 0x000400 */
-#define	DB_INIT_CDB	      0x000800	/* Concurrent Access Methods. */
-#define	DB_INIT_LOCK	      0x001000	/* Initialize locking. */
-#define	DB_INIT_LOG	      0x002000	/* Initialize logging. */
-#define	DB_INIT_MPOOL	      0x004000	/* Initialize mpool. */
-#define	DB_INIT_TXN	      0x008000	/* Initialize transactions. */
-#define	DB_JOINENV	      0x010000	/* Initialize all subsystems present. */
-#define	DB_LOCKDOWN	      0x020000	/* Lock memory into physical core. */
-#define	DB_PRIVATE	      0x040000	/* DB_ENV is process local. */
-#define	DB_RECOVER_FATAL      0x080000	/* Run catastrophic recovery. */
-#define	DB_SYSTEM_MEM	      0x100000	/* Use system-backed memory. */
-
-/*
- * Flags private to DB->open.
- *	   Shared flags up to 0x000400 */
-#define	DB_EXCL		      0x000800	/* Exclusive open (O_EXCL). */
-#define	DB_FCNTL_LOCKING      0x001000	/* UNDOC: fcntl(2) locking. */
-#define	DB_RDWRMASTER	      0x002000	/* UNDOC: allow subdb master open R/W */
-#define	DB_WRITEOPEN	      0x004000	/* UNDOC: open with write lock. */
-
-/*
- * Flags private to DB_ENV->txn_begin.
- *	   Shared flags up to 0x000400 */
-#define	DB_TXN_NOWAIT	      0x000800	/* Do not wait for locks in this TXN. */
-#define	DB_TXN_SYNC	      0x001000	/* Always sync log on commit. */
-
-/*
- * Flags private to DB_ENV->set_encrypt.
- */
-#define	DB_ENCRYPT_AES	      0x000001	/* AES, assumes SHA1 checksum */
-
-/*
- * Flags private to DB_ENV->set_flags.
- *	   Shared flags up to 0x000400 */
-#define	DB_CDB_ALLDB	      0x000800	/* Set CDB locking per environment. */
-#define	DB_DIRECT_DB	      0x001000	/* Don't buffer databases in the OS. */
-#define	DB_DIRECT_LOG	      0x002000	/* Don't buffer log files in the OS. */
-#define	DB_NOLOCKING	      0x004000	/* Set locking/mutex behavior. */
-#define	DB_NOPANIC	      0x008000	/* Set panic state per DB_ENV. */
-#define	DB_OVERWRITE	      0x010000	/* Overwrite unlinked region files. */
-#define	DB_PANIC_ENVIRONMENT  0x020000	/* Set panic state per environment. */
-#define	DB_REGION_INIT	      0x040000	/* Page-fault regions on open. */
-#define	DB_TXN_WRITE_NOSYNC   0x080000	/* Write, don't sync, on txn commit. */
-#define	DB_YIELDCPU	      0x100000	/* Yield the CPU (a lot). */
-
-/*
- * Flags private to DB->set_feedback's callback.
- */
-#define	DB_UPGRADE	      0x000001	/* Upgrading. */
-#define	DB_VERIFY	      0x000002	/* Verifying. */
-
-/*
- * Flags private to DB_MPOOLFILE->open.
- *	   Shared flags up to 0x000400 */
-#define	DB_DIRECT	      0x000800	/* Don't buffer the file in the OS. */
-#define	DB_EXTENT	      0x001000	/* UNDOC: dealing with an extent. */
-#define	DB_ODDFILESIZE	      0x002000	/* Truncate file to N * pgsize. */
-
-/*
- * Flags private to DB->set_flags.
- */
-#define	DB_CHKSUM_SHA1	      0x000001	/* Use SHA1 checksumming */
-#define	DB_DUP		      0x000002	/* Btree, Hash: duplicate keys. */
-#define	DB_DUPSORT	      0x000004	/* Btree, Hash: duplicate keys. */
-#define	DB_ENCRYPT	      0x000008	/* Btree, Hash: duplicate keys. */
-#define	DB_RECNUM	      0x000010	/* Btree: record numbers. */
-#define	DB_RENUMBER	      0x000020	/* Recno: renumber on insert/delete. */
-#define	DB_REVSPLITOFF	      0x000040	/* Btree: turn off reverse splits. */
-#define	DB_SNAPSHOT	      0x000080	/* Recno: snapshot the input. */
-
-/*
- * Flags private to the DB->stat methods.
- */
-#define	DB_STAT_CLEAR	      0x000001	/* Clear stat after returning values. */
-
-/*
- * Flags private to DB->join.
- */
-#define	DB_JOIN_NOSORT	      0x000001	/* Don't try to optimize join. */
-
-/*
- * Flags private to DB->verify.
- */
-#define	DB_AGGRESSIVE	      0x000001	/* Salvage whatever could be data.*/
-#define	DB_NOORDERCHK	      0x000002	/* Skip sort order/hashing check. */
-#define	DB_ORDERCHKONLY	      0x000004	/* Only perform the order check. */
-#define	DB_PR_PAGE	      0x000008	/* Show page contents (-da). */
-#define	DB_PR_RECOVERYTEST    0x000010	/* Recovery test (-dr). */
-#define	DB_PRINTABLE	      0x000020	/* Use printable format for salvage. */
-#define	DB_SALVAGE	      0x000040	/* Salvage what looks like data. */
-/*
- * !!!
- * These must not go over 0x8000, or they will collide with the flags
- * used by __bam_vrfy_subtree.
- */
-
-/*
- * Flags private to DB->set_rep_transport's send callback.
- */
-#define	DB_REP_PERMANENT	0x0001	/* Important--app. may want to flush. */
-
-/*******************************************************
- * Locking.
- *******************************************************/
-#define	DB_LOCKVERSION	1
-
-#define	DB_FILE_ID_LEN		20	/* Unique file ID length. */
-
-/*
- * Deadlock detector modes; used in the DB_ENV structure to configure the
- * locking subsystem.
- */
-#define	DB_LOCK_NORUN		0
-#define	DB_LOCK_DEFAULT		1	/* Default policy. */
-#define	DB_LOCK_EXPIRE		2	/* Only expire locks, no detection. */
-#define	DB_LOCK_MAXLOCKS	3	/* Abort txn with maximum # of locks. */
-#define	DB_LOCK_MINLOCKS	4	/* Abort txn with minimum # of locks. */
-#define	DB_LOCK_MINWRITE	5	/* Abort txn with minimum writelocks. */
-#define	DB_LOCK_OLDEST		6	/* Abort oldest transaction. */
-#define	DB_LOCK_RANDOM		7	/* Abort random transaction. */
-#define	DB_LOCK_YOUNGEST	8	/* Abort youngest transaction. */
-
-/* Flag values for lock_vec(), lock_get(). */
-#define	DB_LOCK_FREE_LOCKER	0x001	/* Internal: Free locker as well. */
-#define	DB_LOCK_NOWAIT		0x002	/* Don't wait on unavailable lock. */
-#define	DB_LOCK_RECORD		0x004	/* Internal: record lock. */
-#define	DB_LOCK_REMOVE		0x008	/* Internal: flag object removed. */
-#define	DB_LOCK_SET_TIMEOUT	0x010	/* Internal: set lock timeout. */
-#define	DB_LOCK_SWITCH		0x020	/* Internal: switch existing lock. */
-#define	DB_LOCK_UPGRADE		0x040	/* Internal: upgrade existing lock. */
-
-/*
- * Simple R/W lock modes and for multi-granularity intention locking.
- *
- * !!!
- * These values are NOT random, as they are used as an index into the lock
- * conflicts arrays, i.e., DB_LOCK_IWRITE must be == 3, and DB_LOCK_IREAD
- * must be == 4.
- */
-typedef enum {
-	DB_LOCK_NG=0,			/* Not granted. */
-	DB_LOCK_READ=1,			/* Shared/read. */
-	DB_LOCK_WRITE=2,		/* Exclusive/write. */
-	DB_LOCK_WAIT=3,			/* Wait for event */
-	DB_LOCK_IWRITE=4,		/* Intent exclusive/write. */
-	DB_LOCK_IREAD=5,		/* Intent to share/read. */
-	DB_LOCK_IWR=6,			/* Intent to read and write. */
-	DB_LOCK_DIRTY=7,		/* Dirty Read. */
-	DB_LOCK_WWRITE=8		/* Was Written. */
-} db_lockmode_t;
-
-/*
- * Request types.
- */
-typedef enum {
-	DB_LOCK_DUMP=0,			/* Display held locks. */
-	DB_LOCK_GET=1,			/* Get the lock. */
-	DB_LOCK_GET_TIMEOUT=2,		/* Get lock with a timeout. */
-	DB_LOCK_INHERIT=3,		/* Pass locks to parent. */
-	DB_LOCK_PUT=4,			/* Release the lock. */
-	DB_LOCK_PUT_ALL=5,		/* Release locker's locks. */
-	DB_LOCK_PUT_OBJ=6,		/* Release locker's locks on obj. */
-	DB_LOCK_PUT_READ=7,		/* Release locker's read locks. */
-	DB_LOCK_TIMEOUT=8,		/* Force a txn to timeout. */
-	DB_LOCK_TRADE=9,		/* Trade locker ids on a lock. */
-	DB_LOCK_UPGRADE_WRITE=10	/* Upgrade writes for dirty reads. */
-} db_lockop_t;
-
-/*
- * Status of a lock.
- */
-typedef enum  {
-	DB_LSTAT_ABORTED=1,		/* Lock belongs to an aborted txn. */
-	DB_LSTAT_ERR=2,			/* Lock is bad. */
-	DB_LSTAT_EXPIRED=3,		/* Lock has expired. */
-	DB_LSTAT_FREE=4,		/* Lock is unallocated. */
-	DB_LSTAT_HELD=5,		/* Lock is currently held. */
-	DB_LSTAT_NOTEXIST=6,		/* Object on which lock was waiting
-					 * was removed */
-	DB_LSTAT_PENDING=7,		/* Lock was waiting and has been
-					 * promoted; waiting for the owner
-					 * to run and upgrade it to held. */
-	DB_LSTAT_WAITING=8		/* Lock is on the wait queue. */
-}db_status_t;
-
-/* Lock statistics structure. */
-struct __db_lock_stat {
-	u_int32_t st_id;		/* Last allocated locker ID. */
-	u_int32_t st_cur_maxid;		/* Current maximum unused ID. */
-	u_int32_t st_maxlocks;		/* Maximum number of locks in table. */
-	u_int32_t st_maxlockers;	/* Maximum num of lockers in table. */
-	u_int32_t st_maxobjects;	/* Maximum num of objects in table. */
-	u_int32_t st_nmodes;		/* Number of lock modes. */
-	u_int32_t st_nlocks;		/* Current number of locks. */
-	u_int32_t st_maxnlocks;		/* Maximum number of locks so far. */
-	u_int32_t st_nlockers;		/* Current number of lockers. */
-	u_int32_t st_maxnlockers;	/* Maximum number of lockers so far. */
-	u_int32_t st_nobjects;		/* Current number of objects. */
-	u_int32_t st_maxnobjects;	/* Maximum number of objects so far. */
-	u_int32_t st_nconflicts;	/* Number of lock conflicts. */
-	u_int32_t st_nrequests;		/* Number of lock gets. */
-	u_int32_t st_nreleases;		/* Number of lock puts. */
-	u_int32_t st_nnowaits;		/* Number of requests that would have
-					   waited, but NOWAIT was set. */
-	u_int32_t st_ndeadlocks;	/* Number of lock deadlocks. */
-	db_timeout_t st_locktimeout;	/* Lock timeout. */
-	u_int32_t st_nlocktimeouts;	/* Number of lock timeouts. */
-	db_timeout_t st_txntimeout;	/* Transaction timeout. */
-	u_int32_t st_ntxntimeouts;	/* Number of transaction timeouts. */
-	u_int32_t st_region_wait;	/* Region lock granted after wait. */
-	u_int32_t st_region_nowait;	/* Region lock granted without wait. */
-	u_int32_t st_regsize;		/* Region size. */
-};
-
-/*
- * DB_LOCK_ILOCK --
- *	Internal DB access method lock.
- */
-struct __db_ilock {
-	db_pgno_t pgno;			/* Page being locked. */
-	u_int8_t fileid[DB_FILE_ID_LEN];/* File id. */
-#define	DB_HANDLE_LOCK	1
-#define	DB_RECORD_LOCK	2
-#define	DB_PAGE_LOCK	3
-#define	DB_TXN_LOCK	4
-	u_int32_t type;			/* Type of lock. */
-};
-
-/*
- * DB_LOCK --
- *	The structure is allocated by the caller and filled in during a
- *	lock_get request (or a lock_vec/DB_LOCK_GET).
- */
-struct __db_lock_u {
-	size_t		off;		/* Offset of the lock in the region */
-	u_int32_t	ndx;		/* Index of the object referenced by
-					 * this lock; used for locking. */
-	u_int32_t	gen;		/* Generation number of this lock. */
-	db_lockmode_t	mode;		/* mode of this lock. */
-};
-
-/* Lock request structure. */
-struct __db_lockreq {
-	db_lockop_t	 op;		/* Operation. */
-	db_lockmode_t	 mode;		/* Requested mode. */
-	db_timeout_t	 timeout;	/* Time to expire lock. */
-	DBT		*obj;		/* Object being locked. */
-	DB_LOCK		 lock;		/* Lock returned. */
-};
-
-/*******************************************************
- * Logging.
- *******************************************************/
-#define	DB_LOGVERSION	7		/* Current log version. */
-#define	DB_LOGOLDVER	7		/* Oldest log version supported. */
-#define	DB_LOGMAGIC	0x040988
-
-/* Flag values for log_archive(). */
-#define	DB_ARCH_ABS		0x001	/* Absolute pathnames. */
-#define	DB_ARCH_DATA		0x002	/* Data files. */
-#define	DB_ARCH_LOG		0x004	/* Log files. */
-
-/*
- * A DB_LSN has two parts, a fileid which identifies a specific file, and an
- * offset within that file.  The fileid is an unsigned 4-byte quantity that
- * uniquely identifies a file within the log directory -- currently a simple
- * counter inside the log.  The offset is also an unsigned 4-byte value.  The
- * log manager guarantees the offset is never more than 4 bytes by switching
- * to a new log file before the maximum length imposed by an unsigned 4-byte
- * offset is reached.
- */
-struct __db_lsn {
-	u_int32_t	file;		/* File ID. */
-	u_int32_t	offset;		/* File offset. */
-};
-
-/*
- * DB_LOGC --
- *	Log cursor.
- */
-struct __db_log_cursor {
-	DB_ENV	 *dbenv;		/* Enclosing dbenv. */
-
-	DB_FH	 *c_fh;			/* File handle. */
-	DB_LSN	  c_lsn;		/* Cursor: LSN */
-	u_int32_t c_len;		/* Cursor: record length */
-	u_int32_t c_prev;		/* Cursor: previous record's offset */
-
-	DBT	  c_dbt;		/* Return DBT. */
-
-#define	DB_LOGC_BUF_SIZE	(32 * 1024)
-	u_int8_t *bp;			/* Allocated read buffer. */
-	u_int32_t bp_size;		/* Read buffer length in bytes. */
-	u_int32_t bp_rlen;		/* Read buffer valid data length. */
-	DB_LSN	  bp_lsn;		/* Read buffer first byte LSN. */
-
-	u_int32_t bp_maxrec;		/* Max record length in the log file. */
-
-					/* Methods. */
-	int (*close) __P((DB_LOGC *, u_int32_t));
-	int (*get) __P((DB_LOGC *, DB_LSN *, DBT *, u_int32_t));
-
-#define	DB_LOG_DISK		0x01	/* Log record came from disk. */
-#define	DB_LOG_LOCKED		0x02	/* Log region already locked */
-#define	DB_LOG_SILENT_ERR	0x04	/* Turn-off error messages. */
-	u_int32_t flags;
-};
-
-/* Log statistics structure. */
-struct __db_log_stat {
-	u_int32_t st_magic;		/* Log file magic number. */
-	u_int32_t st_version;		/* Log file version number. */
-	int st_mode;			/* Log file mode. */
-	u_int32_t st_lg_bsize;		/* Log buffer size. */
-	u_int32_t st_lg_size;		/* Log file size. */
-	u_int32_t st_w_bytes;		/* Bytes to log. */
-	u_int32_t st_w_mbytes;		/* Megabytes to log. */
-	u_int32_t st_wc_bytes;		/* Bytes to log since checkpoint. */
-	u_int32_t st_wc_mbytes;		/* Megabytes to log since checkpoint. */
-	u_int32_t st_wcount;		/* Total writes to the log. */
-	u_int32_t st_wcount_fill;	/* Overflow writes to the log. */
-	u_int32_t st_scount;		/* Total syncs to the log. */
-	u_int32_t st_region_wait;	/* Region lock granted after wait. */
-	u_int32_t st_region_nowait;	/* Region lock granted without wait. */
-	u_int32_t st_cur_file;		/* Current log file number. */
-	u_int32_t st_cur_offset;	/* Current log file offset. */
-	u_int32_t st_disk_file;		/* Known on disk log file number. */
-	u_int32_t st_disk_offset;	/* Known on disk log file offset. */
-	u_int32_t st_regsize;		/* Region size. */
-	u_int32_t st_maxcommitperflush;	/* Max number of commits in a flush. */
-	u_int32_t st_mincommitperflush;	/* Min number of commits in a flush. */
-};
-
-/*******************************************************
- * Shared buffer cache (mpool).
- *******************************************************/
-/* Flag values for DB_MPOOLFILE->get. */
-#define	DB_MPOOL_CREATE		0x001	/* Create a page. */
-#define	DB_MPOOL_LAST		0x002	/* Return the last page. */
-#define	DB_MPOOL_NEW		0x004	/* Create a new page. */
-
-/* Flag values for DB_MPOOLFILE->put, DB_MPOOLFILE->set. */
-#define	DB_MPOOL_CLEAN		0x001	/* Page is not modified. */
-#define	DB_MPOOL_DIRTY		0x002	/* Page is modified. */
-#define	DB_MPOOL_DISCARD	0x004	/* Don't cache the page. */
-
-/* Priority values for DB_MPOOLFILE->set_priority. */
-typedef enum {
-	DB_PRIORITY_VERY_LOW=1,
-	DB_PRIORITY_LOW=2,
-	DB_PRIORITY_DEFAULT=3,
-	DB_PRIORITY_HIGH=4,
-	DB_PRIORITY_VERY_HIGH=5
-} DB_CACHE_PRIORITY;
-
-/* Per-process DB_MPOOLFILE information. */
-struct __db_mpoolfile {
-	/* These fields need to be protected for multi-threaded support. */
-	DB_MUTEX *mutexp;		/* Structure thread lock. */
-
-	DB_FH	  *fhp;			/* Underlying file handle. */
-
-	u_int32_t  ref;			/* Reference count. */
-
-	/*
-	 * !!!
-	 * The pinref and q fields are protected by the region lock, not the
-	 * DB_MPOOLFILE structure mutex.  We don't use the structure mutex
-	 * because then I/O (which holds the structure lock held because of
-	 * the race between the seek and write of the file descriptor) would
-	 * block any other put/get calls using this DB_MPOOLFILE structure.
-	 */
-	u_int32_t pinref;		/* Pinned block reference count. */
-
-	/*
-	 * !!!
-	 * Explicit representations of structures from queue.h.
-	 * TAILQ_ENTRY(__db_mpoolfile) q;
-	 */
-	struct {
-		struct __db_mpoolfile *tqe_next;
-		struct __db_mpoolfile **tqe_prev;
-	} q;				/* Linked list of DB_MPOOLFILE's. */
-
-	/*
-	 * These fields are not thread-protected because they are initialized
-	 * when the file is opened and never modified.
-	 */
-	int	  ftype;		/* File type. */
-	DBT	 *pgcookie;		/* Byte-string passed to pgin/pgout. */
-	u_int8_t *fileid;		/* Unique file ID. */
-	int32_t	  lsn_offset;		/* LSN offset in page. */
-	u_int32_t clear_len;		/* Cleared length on created pages. */
-
-	DB_MPOOL  *dbmp;		/* Overlying DB_MPOOL. */
-	MPOOLFILE *mfp;			/* Underlying MPOOLFILE. */
-
-	void	  *addr;		/* Address of mmap'd region. */
-	size_t	   len;			/* Length of mmap'd region. */
-
-					/* Methods. */
-	int  (*close) __P((DB_MPOOLFILE *, u_int32_t));
-	int  (*get) __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, void *));
-	void (*get_fileid) __P((DB_MPOOLFILE *, u_int8_t *));
-	void (*last_pgno) __P((DB_MPOOLFILE *, db_pgno_t *));
-	int  (*open)__P((DB_MPOOLFILE *, const char *, u_int32_t, int, size_t));
-	int  (*put) __P((DB_MPOOLFILE *, void *, u_int32_t));
-	void (*refcnt) __P((DB_MPOOLFILE *, db_pgno_t *));
-	int  (*set) __P((DB_MPOOLFILE *, void *, u_int32_t));
-	int  (*set_clear_len) __P((DB_MPOOLFILE *, u_int32_t));
-	int  (*set_fileid) __P((DB_MPOOLFILE *, u_int8_t *));
-	int  (*set_ftype) __P((DB_MPOOLFILE *, int));
-	int  (*set_lsn_offset) __P((DB_MPOOLFILE *, int32_t));
-	int  (*set_pgcookie) __P((DB_MPOOLFILE *, DBT *));
-	int  (*set_priority) __P((DB_MPOOLFILE *, DB_CACHE_PRIORITY));
-	void (*set_unlink) __P((DB_MPOOLFILE *, int));
-	int  (*sync) __P((DB_MPOOLFILE *));
-
-	/*
-	 * MP_OPEN_CALLED and MP_READONLY do not need to be thread protected
-	 * because they are initialized when the file is opened, and never
-	 * modified.
-	 *
-	 * MP_FLUSH, MP_UPGRADE and MP_UPGRADE_FAIL are thread protected
-	 * becase they are potentially read by multiple threads of control.
-	 */
-#define	MP_FLUSH	0x001		/* Was opened to flush a buffer. */
-#define	MP_OPEN_CALLED	0x002		/* File opened. */
-#define	MP_READONLY	0x004		/* File is readonly. */
-#define	MP_UPGRADE	0x008		/* File descriptor is readwrite. */
-#define	MP_UPGRADE_FAIL	0x010		/* Upgrade wasn't possible. */
-	u_int32_t  flags;
-};
-
-/*
- * Mpool statistics structure.
- */
-struct __db_mpool_stat {
-	u_int32_t st_gbytes;		/* Total cache size: GB. */
-	u_int32_t st_bytes;		/* Total cache size: B. */
-	u_int32_t st_ncache;		/* Number of caches. */
-	u_int32_t st_regsize;		/* Cache size. */
-	u_int32_t st_map;		/* Pages from mapped files. */
-	u_int32_t st_cache_hit;		/* Pages found in the cache. */
-	u_int32_t st_cache_miss;	/* Pages not found in the cache. */
-	u_int32_t st_page_create;	/* Pages created in the cache. */
-	u_int32_t st_page_in;		/* Pages read in. */
-	u_int32_t st_page_out;		/* Pages written out. */
-	u_int32_t st_ro_evict;		/* Clean pages forced from the cache. */
-	u_int32_t st_rw_evict;		/* Dirty pages forced from the cache. */
-	u_int32_t st_page_trickle;	/* Pages written by memp_trickle. */
-	u_int32_t st_pages;		/* Total number of pages. */
-	u_int32_t st_page_clean;	/* Clean pages. */
-	u_int32_t st_page_dirty;	/* Dirty pages. */
-	u_int32_t st_hash_buckets;	/* Number of hash buckets. */
-	u_int32_t st_hash_searches;	/* Total hash chain searches. */
-	u_int32_t st_hash_longest;	/* Longest hash chain searched. */
-	u_int32_t st_hash_examined;	/* Total hash entries searched. */
-	u_int32_t st_hash_nowait;	/* Hash lock granted with nowait. */
-	u_int32_t st_hash_wait;		/* Hash lock granted after wait. */
-	u_int32_t st_hash_max_wait;	/* Max hash lock granted after wait. */
-	u_int32_t st_region_nowait;	/* Region lock granted with nowait. */
-	u_int32_t st_region_wait;	/* Region lock granted after wait. */
-	u_int32_t st_alloc;		/* Number of page allocations. */
-	u_int32_t st_alloc_buckets;	/* Buckets checked during allocation. */
-	u_int32_t st_alloc_max_buckets;	/* Max checked during allocation. */
-	u_int32_t st_alloc_pages;	/* Pages checked during allocation. */
-	u_int32_t st_alloc_max_pages;	/* Max checked during allocation. */
-};
-
-/* Mpool file statistics structure. */
-struct __db_mpool_fstat {
-	char *file_name;		/* File name. */
-	size_t st_pagesize;		/* Page size. */
-	u_int32_t st_map;		/* Pages from mapped files. */
-	u_int32_t st_cache_hit;		/* Pages found in the cache. */
-	u_int32_t st_cache_miss;	/* Pages not found in the cache. */
-	u_int32_t st_page_create;	/* Pages created in the cache. */
-	u_int32_t st_page_in;		/* Pages read in. */
-	u_int32_t st_page_out;		/* Pages written out. */
-};
-
-/*******************************************************
- * Transactions and recovery.
- *******************************************************/
-#define	DB_TXNVERSION	1
-
-typedef enum {
-	DB_TXN_ABORT=0,			/* Public. */
-	DB_TXN_APPLY=1,			/* Public. */
-	DB_TXN_BACKWARD_ALLOC=2,	/* Internal. */
-	DB_TXN_BACKWARD_ROLL=3,		/* Public. */
-	DB_TXN_FORWARD_ROLL=4,		/* Public. */
-	DB_TXN_GETPGNOS=5,		/* Internal. */
-	DB_TXN_OPENFILES=6,		/* Internal. */
-	DB_TXN_POPENFILES=7,		/* Internal. */
-	DB_TXN_PRINT=8			/* Public. */
-} db_recops;
-
-/*
- * BACKWARD_ALLOC is used during the forward pass to pick up any aborted
- * allocations for files that were created during the forward pass.
- * The main difference between _ALLOC and _ROLL is that the entry for
- * the file not exist during the rollforward pass.
- */
-#define	DB_UNDO(op)	((op) == DB_TXN_ABORT ||			\
-		(op) == DB_TXN_BACKWARD_ROLL || (op) == DB_TXN_BACKWARD_ALLOC)
-#define	DB_REDO(op)	((op) == DB_TXN_FORWARD_ROLL || (op) == DB_TXN_APPLY)
-
-struct __db_txn {
-	DB_TXNMGR	*mgrp;		/* Pointer to transaction manager. */
-	DB_TXN		*parent;	/* Pointer to transaction's parent. */
-	DB_LSN		last_lsn;	/* Lsn of last log write. */
-	u_int32_t	txnid;		/* Unique transaction id. */
-	roff_t		off;		/* Detail structure within region. */
-	db_timeout_t	lock_timeout;	/* Timeout for locks for this txn. */
-	db_timeout_t	expire;		/* Time this txn expires. */
-	void		*txn_list;	/* Undo information for parent. */
-
-	/*
-	 * !!!
-	 * Explicit representations of structures from queue.h.
-	 * TAILQ_ENTRY(__db_txn) links;
-	 */
-	struct {
-		struct __db_txn *tqe_next;
-		struct __db_txn **tqe_prev;
-	} links;			/* Links transactions off manager. */
-
-	/*
-	 * !!!
-	 * Explicit representations of structures from queue.h.
-	 * TAILQ_HEAD(__events, __txn_event) events;
-	 */
-	struct {
-		struct __txn_event *tqh_first;
-		struct __txn_event **tqh_last;
-	} events;
-
-	/*
-	 * !!!
-	 * Explicit representations of structures from queue.h.
-	 * TAILQ_HEAD(__kids, __db_txn) kids;
-	 */
-	struct __kids {
-		struct __db_txn *tqh_first;
-		struct __db_txn **tqh_last;
-	} kids;
-
-	/*
-	 * !!!
-	 * Explicit representations of structures from queue.h.
-	 * TAILQ_ENTRY(__db_txn) klinks;
-	 */
-	struct {
-		struct __db_txn *tqe_next;
-		struct __db_txn **tqe_prev;
-	} klinks;
-
-	/* API-private structure: used by C++ */
-	void	*api_internal;
-
-	u_int32_t	cursors;	/* Number of cursors open for txn */
-
-					/* Methods. */
-	int	  (*abort) __P((DB_TXN *));
-	int	  (*commit) __P((DB_TXN *, u_int32_t));
-	int	  (*discard) __P((DB_TXN *, u_int32_t));
-	u_int32_t (*id) __P((DB_TXN *));
-	int	  (*prepare) __P((DB_TXN *, u_int8_t *));
-	int	  (*set_timeout) __P((DB_TXN *, db_timeout_t, u_int32_t));
-
-#define	TXN_CHILDCOMMIT	0x01		/* Transaction that has committed. */
-#define	TXN_COMPENSATE	0x02		/* Compensating transaction. */
-#define	TXN_DIRTY_READ	0x04		/* Transaction does dirty reads. */
-#define	TXN_LOCKTIMEOUT	0x08		/* Transaction has a lock timeout. */
-#define	TXN_MALLOC	0x10		/* Structure allocated by TXN system. */
-#define	TXN_NOSYNC	0x20		/* Do not sync on prepare and commit. */
-#define	TXN_NOWAIT	0x40		/* Do not wait on locks. */
-#define	TXN_SYNC	0x80		/* Sync on prepare and commit. */
-	u_int32_t	flags;
-};
-
-/* Transaction statistics structure. */
-struct __db_txn_active {
-	u_int32_t	txnid;		/* Transaction ID */
-	u_int32_t	parentid;	/* Transaction ID of parent */
-	DB_LSN		lsn;		/* LSN when transaction began */
-};
-
-struct __db_txn_stat {
-	DB_LSN	  st_last_ckp;		/* lsn of the last checkpoint */
-	time_t	  st_time_ckp;		/* time of last checkpoint */
-	u_int32_t st_last_txnid;	/* last transaction id given out */
-	u_int32_t st_maxtxns;		/* maximum txns possible */
-	u_int32_t st_naborts;		/* number of aborted transactions */
-	u_int32_t st_nbegins;		/* number of begun transactions */
-	u_int32_t st_ncommits;		/* number of committed transactions */
-	u_int32_t st_nactive;		/* number of active transactions */
-	u_int32_t st_nrestores;		/* number of restored transactions
-					   after recovery. */
-	u_int32_t st_maxnactive;	/* maximum active transactions */
-	DB_TXN_ACTIVE *st_txnarray;	/* array of active transactions */
-	u_int32_t st_region_wait;	/* Region lock granted after wait. */
-	u_int32_t st_region_nowait;	/* Region lock granted without wait. */
-	u_int32_t st_regsize;		/* Region size. */
-};
-
-/*
- * Structure used for two phase commit interface.  Berkeley DB support for two
- * phase commit is compatible with the X/open XA interface.  The xa #define
- * XIDDATASIZE defines the size of a global transaction ID.  We have our own
- * version here which must have the same value.
- */
-#define	DB_XIDDATASIZE	128
-struct __db_preplist {
-	DB_TXN	*txn;
-	u_int8_t gid[DB_XIDDATASIZE];
-};
-
-/*******************************************************
- * Replication.
- *******************************************************/
-/* Special, out-of-band environment IDs. */
-#define	DB_EID_BROADCAST	-1
-#define	DB_EID_INVALID		-2
-
-/* rep_start flags values */
-#define	DB_REP_CLIENT		0x001
-#define	DB_REP_LOGSONLY		0x002
-#define	DB_REP_MASTER		0x004
-
-/* Replication statistics. */
-struct __db_rep_stat {
-	/* !!!
-	 * Many replication statistics fields cannot be protected by a mutex
-	 * without an unacceptable performance penalty, since most message
-	 * processing is done without the need to hold a region-wide lock.
-	 * Fields whose comments end with a '+' may be updated without holding
-	 * the replication or log mutexes (as appropriate), and thus may be
-	 * off somewhat (or, on unreasonable architectures under unlucky
-	 * circumstances, garbaged).
-	 */
-	u_int32_t st_status;		/* Current replication status. */
-	DB_LSN st_next_lsn;		/* Next LSN to use or expect. */
-	DB_LSN st_waiting_lsn;		/* LSN we're awaiting, if any. */
-
-	u_int32_t st_dupmasters;	/* # of times a duplicate master
-					   condition was detected.+ */
-	int st_env_id;			/* Current environment ID. */
-	int st_env_priority;		/* Current environment priority. */
-	u_int32_t st_gen;		/* Current generation number. */
-	u_int32_t st_log_duplicated;	/* Log records received multiply.+ */
-	u_int32_t st_log_queued;	/* Log records currently queued.+ */
-	u_int32_t st_log_queued_max;	/* Max. log records queued at once.+ */
-	u_int32_t st_log_queued_total;	/* Total # of log recs. ever queued.+ */
-	u_int32_t st_log_records;	/* Log records received and put.+ */
-	u_int32_t st_log_requested;	/* Log recs. missed and requested.+ */
-	int st_master;			/* Env. ID of the current master. */
-	u_int32_t st_master_changes;	/* # of times we've switched masters. */
-	u_int32_t st_msgs_badgen;	/* Messages with a bad generation #.+ */
-	u_int32_t st_msgs_processed;	/* Messages received and processed.+ */
-	u_int32_t st_msgs_recover;	/* Messages ignored because this site
-					   was a client in recovery.+ */
-	u_int32_t st_msgs_send_failures;/* # of failed message sends.+ */
-	u_int32_t st_msgs_sent;		/* # of successful message sends.+ */
-	u_int32_t st_newsites;		/* # of NEWSITE msgs. received.+ */
-	int st_nsites;			/* Current number of sites we will
-					   assume during elections. */
-	u_int32_t st_nthrottles;	/* # of times we were throttled. */
-	u_int32_t st_outdated;		/* # of times we detected and returned
-					   an OUTDATED condition.+ */
-	u_int32_t st_txns_applied;	/* # of transactions applied.+ */
-
-	/* Elections generally. */
-	u_int32_t st_elections;		/* # of elections held.+ */
-	u_int32_t st_elections_won;	/* # of elections won by this site.+ */
-
-	/* Statistics about an in-progress election. */
-	int st_election_cur_winner;	/* Current front-runner. */
-	u_int32_t st_election_gen;	/* Election generation number. */
-	DB_LSN st_election_lsn;		/* Max. LSN of current winner. */
-	int st_election_nsites;		/* # of "registered voters". */
-	int st_election_priority;	/* Current election priority. */
-	int st_election_status;		/* Current election status. */
-	int st_election_tiebreaker;	/* Election tiebreaker value. */
-	int st_election_votes;		/* Votes received in this round. */
-};
-
-/*******************************************************
- * Access methods.
- *******************************************************/
-typedef enum {
-	DB_BTREE=1,
-	DB_HASH=2,
-	DB_RECNO=3,
-	DB_QUEUE=4,
-	DB_UNKNOWN=5			/* Figure it out on open. */
-} DBTYPE;
-
-#define	DB_RENAMEMAGIC	0x030800	/* File has been renamed. */
-
-#define	DB_BTREEVERSION	9		/* Current btree version. */
-#define	DB_BTREEOLDVER	8		/* Oldest btree version supported. */
-#define	DB_BTREEMAGIC	0x053162
-
-#define	DB_HASHVERSION	8		/* Current hash version. */
-#define	DB_HASHOLDVER	7		/* Oldest hash version supported. */
-#define	DB_HASHMAGIC	0x061561
-
-#define	DB_QAMVERSION	4		/* Current queue version. */
-#define	DB_QAMOLDVER	3		/* Oldest queue version supported. */
-#define	DB_QAMMAGIC	0x042253
-
-/*
- * DB access method and cursor operation values.  Each value is an operation
- * code to which additional bit flags are added.
- */
-#define	DB_AFTER		 1	/* c_put() */
-#define	DB_APPEND		 2	/* put() */
-#define	DB_BEFORE		 3	/* c_put() */
-#define	DB_CACHED_COUNTS	 4	/* stat() */
-#define	DB_COMMIT		 5	/* log_put() (internal) */
-#define	DB_CONSUME		 6	/* get() */
-#define	DB_CONSUME_WAIT		 7	/* get() */
-#define	DB_CURRENT		 8	/* c_get(), c_put(), DB_LOGC->get() */
-#define	DB_FAST_STAT		 9	/* stat() */
-#define	DB_FIRST		10	/* c_get(), DB_LOGC->get() */
-#define	DB_GET_BOTH		11	/* get(), c_get() */
-#define	DB_GET_BOTHC		12	/* c_get() (internal) */
-#define	DB_GET_BOTH_RANGE	13	/* get(), c_get() */
-#define	DB_GET_RECNO		14	/* c_get() */
-#define	DB_JOIN_ITEM		15	/* c_get(); do not do primary lookup */
-#define	DB_KEYFIRST		16	/* c_put() */
-#define	DB_KEYLAST		17	/* c_put() */
-#define	DB_LAST			18	/* c_get(), DB_LOGC->get() */
-#define	DB_NEXT			19	/* c_get(), DB_LOGC->get() */
-#define	DB_NEXT_DUP		20	/* c_get() */
-#define	DB_NEXT_NODUP		21	/* c_get() */
-#define	DB_NODUPDATA		22	/* put(), c_put() */
-#define	DB_NOOVERWRITE		23	/* put() */
-#define	DB_NOSYNC		24	/* close() */
-#define	DB_POSITION		25	/* c_dup() */
-#define	DB_POSITIONI		26	/* c_dup() (internal) */
-#define	DB_PREV			27	/* c_get(), DB_LOGC->get() */
-#define	DB_PREV_NODUP		28	/* c_get(), DB_LOGC->get() */
-#define	DB_RECORDCOUNT		29	/* stat() */
-#define	DB_SET			30	/* c_get(), DB_LOGC->get() */
-#define	DB_SET_LOCK_TIMEOUT	31	/* set_timout() */
-#define	DB_SET_RANGE		32	/* c_get() */
-#define	DB_SET_RECNO		33	/* get(), c_get() */
-#define	DB_SET_TXN_NOW		34	/* set_timout() (internal) */
-#define	DB_SET_TXN_TIMEOUT	35	/* set_timout() */
-#define	DB_UPDATE_SECONDARY	36	/* c_get(), c_del() (internal) */
-#define	DB_WRITECURSOR		37	/* cursor() */
-#define	DB_WRITELOCK		38	/* cursor() (internal) */
-
-/* This has to change when the max opcode hits 255. */
-#define	DB_OPFLAGS_MASK	0x000000ff	/* Mask for operations flags. */
-/*	DB_DIRTY_READ	0x01000000	   Dirty Read. */
-#define	DB_FLUSH	0x02000000	/* Flush data to disk. */
-#define	DB_MULTIPLE	0x04000000	/* Return multiple data values. */
-#define	DB_MULTIPLE_KEY	0x08000000	/* Return multiple data/key pairs. */
-#define	DB_NOCOPY	0x10000000	/* Don't copy data */
-#define	DB_PERMANENT	0x20000000	/* Flag record with REP_PERMANENT. */
-#define	DB_RMW		0x40000000	/* Acquire write flag immediately. */
-#define	DB_WRNOSYNC	0x80000000	/* Private: write, don't sync log_put */
-
-/*
- * DB (user visible) error return codes.
- *
- * !!!
- * For source compatibility with DB 2.X deadlock return (EAGAIN), use the
- * following:
- *	#include <errno.h>
- *	#define DB_LOCK_DEADLOCK EAGAIN
- *
- * !!!
- * We don't want our error returns to conflict with other packages where
- * possible, so pick a base error value that's hopefully not common.  We
- * document that we own the error name space from -30,800 to -30,999.
- */
-/* DB (public) error return codes. */
-#define	DB_DONOTINDEX		(-30999)/* "Null" return from 2ndary callbk. */
-#define	DB_KEYEMPTY		(-30998)/* Key/data deleted or never created. */
-#define	DB_KEYEXIST		(-30997)/* The key/data pair already exists. */
-#define	DB_LOCK_DEADLOCK	(-30996)/* Deadlock. */
-#define	DB_LOCK_NOTGRANTED	(-30995)/* Lock unavailable. */
-#define	DB_NOSERVER		(-30994)/* Server panic return. */
-#define	DB_NOSERVER_HOME	(-30993)/* Bad home sent to server. */
-#define	DB_NOSERVER_ID		(-30992)/* Bad ID sent to server. */
-#define	DB_NOTFOUND		(-30991)/* Key/data pair not found (EOF). */
-#define	DB_OLD_VERSION		(-30990)/* Out-of-date version. */
-#define	DB_PAGE_NOTFOUND	(-30989)/* Requested page not found. */
-#define	DB_REP_DUPMASTER	(-30988)/* There are two masters. */
-#define	DB_REP_HOLDELECTION	(-30987)/* Time to hold an election. */
-#define	DB_REP_NEWMASTER	(-30986)/* We have learned of a new master. */
-#define	DB_REP_NEWSITE		(-30985)/* New site entered system. */
-#define	DB_REP_OUTDATED		(-30984)/* Site is too far behind master. */
-#define	DB_REP_UNAVAIL		(-30983)/* Site cannot currently be reached. */
-#define	DB_RUNRECOVERY		(-30982)/* Panic return. */
-#define	DB_SECONDARY_BAD	(-30981)/* Secondary index corrupt. */
-#define	DB_VERIFY_BAD		(-30980)/* Verify failed; bad format. */
-
-/* DB (private) error return codes. */
-#define	DB_ALREADY_ABORTED	(-30899)
-#define	DB_DELETED		(-30898)/* Recovery file marked deleted. */
-#define	DB_JAVA_CALLBACK	(-30897)/* Exception during a java callback. */
-#define	DB_LOCK_NOTEXIST	(-30896)/* Object to lock is gone. */
-#define	DB_NEEDSPLIT		(-30895)/* Page needs to be split. */
-#define	DB_SURPRISE_KID		(-30894)/* Child commit where parent
-					   didn't know it was a parent. */
-#define	DB_SWAPBYTES		(-30893)/* Database needs byte swapping. */
-#define	DB_TIMEOUT		(-30892)/* Timed out waiting for election. */
-#define	DB_TXN_CKP		(-30891)/* Encountered ckp record in log. */
-#define	DB_VERIFY_FATAL		(-30890)/* DB->verify cannot proceed. */
-
-/* Database handle. */
-struct __db {
-	/*******************************************************
-	 * Public: owned by the application.
-	 *******************************************************/
-	u_int32_t pgsize;		/* Database logical page size. */
-
-					/* Callbacks. */
-	int (*db_append_recno) __P((DB *, DBT *, db_recno_t));
-	void (*db_feedback) __P((DB *, int, int));
-	int (*dup_compare) __P((DB *, const DBT *, const DBT *));
-
-	void	*app_private;		/* Application-private handle. */
-
-	/*******************************************************
-	 * Private: owned by DB.
-	 *******************************************************/
-	DB_ENV	*dbenv;			/* Backing environment. */
-
-	DBTYPE	 type;			/* DB access method type. */
-
-	DB_MPOOLFILE *mpf;		/* Backing buffer pool. */
-	DB_CACHE_PRIORITY priority;	/* Priority in the buffer pool. */
-
-	DB_MUTEX *mutexp;		/* Synchronization for free threading */
-
-	u_int8_t fileid[DB_FILE_ID_LEN];/* File's unique ID for locking. */
-
-	u_int32_t adj_fileid;		/* File's unique ID for curs. adj. */
-
-#define	DB_LOGFILEID_INVALID	-1
-	FNAME *log_filename;		/* File's naming info for logging. */
-
-	db_pgno_t meta_pgno;		/* Meta page number */
-	u_int32_t lid;			/* Locker id for handle locking. */
-	u_int32_t cur_lid;		/* Current handle lock holder. */
-	u_int32_t associate_lid;	/* Locker id for DB->associate call. */
-	DB_LOCK	handle_lock;		/* Lock held on this handle. */
-
-	long	 cl_id;			/* RPC: remote client id. */
-
-	/*
-	 * Returned data memory for DB->get() and friends.
-	 */
-	DBT	 my_rskey;		/* Secondary key. */
-	DBT	 my_rkey;		/* [Primary] key. */
-	DBT	 my_rdata;		/* Data. */
-
-	/*
-	 * !!!
-	 * Some applications use DB but implement their own locking outside of
-	 * DB.  If they're using fcntl(2) locking on the underlying database
-	 * file, and we open and close a file descriptor for that file, we will
-	 * discard their locks.  The DB_FCNTL_LOCKING flag to DB->open is an
-	 * undocumented interface to support this usage which leaves any file
-	 * descriptors we open until DB->close.  This will only work with the
-	 * DB->open interface and simple caches, e.g., creating a transaction
-	 * thread may open/close file descriptors this flag doesn't protect.
-	 * Locking with fcntl(2) on a file that you don't own is a very, very
-	 * unsafe thing to do.  'Nuff said.
-	 */
-	DB_FH	*saved_open_fhp;	/* Saved file handle. */
-
-	/*
-	 * Linked list of DBP's, linked from the DB_ENV, used to keep track
-	 * of all open db handles for cursor adjustment.
-	 *
-	 * !!!
-	 * Explicit representations of structures from queue.h.
-	 * LIST_ENTRY(__db) dblistlinks;
-	 */
-	struct {
-		struct __db *le_next;
-		struct __db **le_prev;
-	} dblistlinks;
-
-	/*
-	 * Cursor queues.
-	 *
-	 * !!!
-	 * Explicit representations of structures from queue.h.
-	 * TAILQ_HEAD(__cq_fq, __dbc) free_queue;
-	 * TAILQ_HEAD(__cq_aq, __dbc) active_queue;
-	 * TAILQ_HEAD(__cq_jq, __dbc) join_queue;
-	 */
-	struct __cq_fq {
-		struct __dbc *tqh_first;
-		struct __dbc **tqh_last;
-	} free_queue;
-	struct __cq_aq {
-		struct __dbc *tqh_first;
-		struct __dbc **tqh_last;
-	} active_queue;
-	struct __cq_jq {
-		struct __dbc *tqh_first;
-		struct __dbc **tqh_last;
-	} join_queue;
-
-	/*
-	 * Secondary index support.
-	 *
-	 * Linked list of secondary indices -- set in the primary.
-	 *
-	 * !!!
-	 * Explicit representations of structures from queue.h.
-	 * LIST_HEAD(s_secondaries, __db);
-	 */
-	struct {
-		struct __db *lh_first;
-	} s_secondaries;
-
-	/*
-	 * List entries for secondaries, and reference count of how
-	 * many threads are updating this secondary (see __db_c_put).
-	 *
-	 * !!!
-	 * Note that these are synchronized by the primary's mutex, but
-	 * filled in in the secondaries.
-	 *
-	 * !!!
-	 * Explicit representations of structures from queue.h.
-	 * LIST_ENTRY(__db) s_links;
-	 */
-	struct {
-		struct __db *le_next;
-		struct __db **le_prev;
-	} s_links;
-	u_int32_t s_refcnt;
-
-	/* Secondary callback and free functions -- set in the secondary. */
-	int	(*s_callback) __P((DB *, const DBT *, const DBT *, DBT *));
-
-	/* Reference to primary -- set in the secondary. */
-	DB	*s_primary;
-
-	/* API-private structure: used by DB 1.85, C++, Java, Perl and Tcl */
-	void	*api_internal;
-
-	/* Subsystem-private structure. */
-	void	*bt_internal;		/* Btree/Recno access method. */
-	void	*h_internal;		/* Hash access method. */
-	void	*q_internal;		/* Queue access method. */
-	void	*xa_internal;		/* XA. */
-
-					/* Methods. */
-	int  (*associate) __P((DB *, DB_TXN *, DB *, int (*)(DB *, const DBT *,
-		const DBT *, DBT *), u_int32_t));
-	int  (*close) __P((DB *, u_int32_t));
-	int  (*cursor) __P((DB *, DB_TXN *, DBC **, u_int32_t));
-	int  (*del) __P((DB *, DB_TXN *, DBT *, u_int32_t));
-	void (*err) __P((DB *, int, const char *, ...));
-	void (*errx) __P((DB *, const char *, ...));
-	int  (*fd) __P((DB *, int *));
-	int  (*get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-	int  (*pget) __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
-	int  (*get_byteswapped) __P((DB *, int *));
-	int  (*get_type) __P((DB *, DBTYPE *));
-	int  (*join) __P((DB *, DBC **, DBC **, u_int32_t));
-	int  (*key_range) __P((DB *,
-		DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
-	int  (*open) __P((DB *, DB_TXN *,
-		const char *, const char *, DBTYPE, u_int32_t, int));
-	int  (*put) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-	int  (*remove) __P((DB *, const char *, const char *, u_int32_t));
-	int  (*rename) __P((DB *,
-	    const char *, const char *, const char *, u_int32_t));
-	int  (*truncate) __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
-	int  (*set_append_recno) __P((DB *, int (*)(DB *, DBT *, db_recno_t)));
-	int  (*set_alloc) __P((DB *, void *(*)(size_t),
-		void *(*)(void *, size_t), void (*)(void *)));
-	int  (*set_cachesize) __P((DB *, u_int32_t, u_int32_t, int));
-	int  (*set_cache_priority) __P((DB *, DB_CACHE_PRIORITY));
-	int  (*set_dup_compare) __P((DB *,
-	    int (*)(DB *, const DBT *, const DBT *)));
-	int  (*set_encrypt) __P((DB *, const char *, u_int32_t));
-	void (*set_errcall) __P((DB *, void (*)(const char *, char *)));
-	void (*set_errfile) __P((DB *, FILE *));
-	void (*set_errpfx) __P((DB *, const char *));
-	int  (*set_feedback) __P((DB *, void (*)(DB *, int, int)));
-	int  (*set_flags) __P((DB *, u_int32_t));
-	int  (*set_lorder) __P((DB *, int));
-	int  (*set_pagesize) __P((DB *, u_int32_t));
-	int  (*set_paniccall) __P((DB *, void (*)(DB_ENV *, int)));
-	int  (*stat) __P((DB *, void *, u_int32_t));
-	int  (*sync) __P((DB *, u_int32_t));
-	int  (*upgrade) __P((DB *, const char *, u_int32_t));
-	int  (*verify) __P((DB *,
-	    const char *, const char *, FILE *, u_int32_t));
-
-	int  (*set_bt_compare) __P((DB *,
-	    int (*)(DB *, const DBT *, const DBT *)));
-	int  (*set_bt_maxkey) __P((DB *, u_int32_t));
-	int  (*set_bt_minkey) __P((DB *, u_int32_t));
-	int  (*set_bt_prefix) __P((DB *,
-	    size_t (*)(DB *, const DBT *, const DBT *)));
-
-	int  (*set_h_ffactor) __P((DB *, u_int32_t));
-	int  (*set_h_hash) __P((DB *,
-	    u_int32_t (*)(DB *, const void *, u_int32_t)));
-	int  (*set_h_nelem) __P((DB *, u_int32_t));
-
-	int  (*set_re_delim) __P((DB *, int));
-	int  (*set_re_len) __P((DB *, u_int32_t));
-	int  (*set_re_pad) __P((DB *, int));
-	int  (*set_re_source) __P((DB *, const char *));
-	int  (*set_q_extentsize) __P((DB *, u_int32_t));
-
-	int  (*db_am_remove) __P((DB *,
-	    DB_TXN *, const char *, const char *, DB_LSN *));
-	int  (*db_am_rename) __P((DB *, DB_TXN *,
-	    const char *, const char *, const char *));
-
-	/*
-	 * Never called; these are a place to save function pointers
-	 * so that we can undo an associate.
-	 */
-	int  (*stored_get) __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-	int  (*stored_close) __P((DB *, u_int32_t));
-
-#define	DB_OK_BTREE	0x01
-#define	DB_OK_HASH	0x02
-#define	DB_OK_QUEUE	0x04
-#define	DB_OK_RECNO	0x08
-	u_int32_t	am_ok;		/* Legal AM choices. */
-
-#define	DB_AM_CHKSUM		0x00000001 /* Checksumming. */
-#define	DB_AM_CL_WRITER		0x00000002 /* Allow writes in client replica. */
-#define	DB_AM_COMPENSATE	0x00000004 /* Created by compensating txn. */
-#define	DB_AM_CREATED		0x00000008 /* Database was created upon open. */
-#define	DB_AM_CREATED_MSTR	0x00000010 /* Encompassing file was created. */
-#define	DB_AM_DBM_ERROR		0x00000020 /* Error in DBM/NDBM database. */
-#define	DB_AM_DELIMITER		0x00000040 /* Variable length delimiter set. */
-#define	DB_AM_DIRTY		0x00000080 /* Support Dirty Reads. */
-#define	DB_AM_DISCARD		0x00000100 /* Discard any cached pages. */
-#define	DB_AM_DUP		0x00000200 /* DB_DUP. */
-#define	DB_AM_DUPSORT		0x00000400 /* DB_DUPSORT. */
-#define	DB_AM_ENCRYPT		0x00000800 /* Encryption. */
-#define	DB_AM_FIXEDLEN		0x00001000 /* Fixed-length records. */
-#define	DB_AM_INMEM		0x00002000 /* In-memory; no sync on close. */
-#define	DB_AM_IN_RENAME		0x00004000 /* File is being renamed. */
-#define	DB_AM_OPEN_CALLED	0x00008000 /* DB->open called. */
-#define	DB_AM_PAD		0x00010000 /* Fixed-length record pad. */
-#define	DB_AM_PGDEF		0x00020000 /* Page size was defaulted. */
-#define	DB_AM_RDONLY		0x00040000 /* Database is readonly. */
-#define	DB_AM_RECNUM		0x00080000 /* DB_RECNUM. */
-#define	DB_AM_RECOVER		0x00100000 /* DB opened by recovery routine. */
-#define	DB_AM_RENUMBER		0x00200000 /* DB_RENUMBER. */
-#define	DB_AM_REVSPLITOFF	0x00400000 /* DB_REVSPLITOFF. */
-#define	DB_AM_SECONDARY		0x00800000 /* Database is a secondary index. */
-#define	DB_AM_SNAPSHOT		0x01000000 /* DB_SNAPSHOT. */
-#define	DB_AM_SUBDB		0x02000000 /* Subdatabases supported. */
-#define	DB_AM_SWAP		0x04000000 /* Pages need to be byte-swapped. */
-#define	DB_AM_TXN		0x08000000 /* Opened in a transaction. */
-#define	DB_AM_VERIFYING		0x10000000 /* DB handle is in the verifier. */
-	u_int32_t flags;
-};
-
-/*
- * Macros for bulk get.  Note that wherever we use a DBT *, we explicitly
- * cast it; this allows the same macros to work with C++ Dbt *'s, as Dbt
- * is a subclass of struct DBT in C++.
- */
-#define	DB_MULTIPLE_INIT(pointer, dbt)					\
-	(pointer = (u_int8_t *)((DBT *)(dbt))->data +			\
-	    ((DBT *)(dbt))->ulen - sizeof(u_int32_t))
-#define	DB_MULTIPLE_NEXT(pointer, dbt, retdata, retdlen)		\
-	do {								\
-		if (*((u_int32_t *)(pointer)) == (u_int32_t)-1) {	\
-			retdata = NULL;					\
-			pointer = NULL;					\
-			break;						\
-		}							\
-		retdata = (u_int8_t *)					\
-		    ((DBT *)(dbt))->data + *(u_int32_t *)(pointer);	\
-		(pointer) = (u_int32_t *)(pointer) - 1;			\
-		retdlen = *(u_int32_t *)(pointer);			\
-		(pointer) = (u_int32_t *)(pointer) - 1;			\
-		if (retdlen == 0 &&					\
-		    retdata == (u_int8_t *)((DBT *)(dbt))->data)	\
-			retdata = NULL;					\
-	} while (0)
-#define	DB_MULTIPLE_KEY_NEXT(pointer, dbt, retkey, retklen, retdata, retdlen) \
-	do {								\
-		if (*((u_int32_t *)(pointer)) == (u_int32_t)-1) {	\
-			retdata = NULL;					\
-			retkey = NULL;					\
-			pointer = NULL;					\
-			break;						\
-		}							\
-		retkey = (u_int8_t *)					\
-		    ((DBT *)(dbt))->data + *(u_int32_t *)(pointer);	\
-		(pointer) = (u_int32_t *)(pointer) - 1;			\
-		retklen = *(u_int32_t *)(pointer);			\
-		(pointer) = (u_int32_t *)(pointer) - 1;			\
-		retdata = (u_int8_t *)					\
-		    ((DBT *)(dbt))->data + *(u_int32_t *)(pointer);	\
-		(pointer) = (u_int32_t *)(pointer) - 1;			\
-		retdlen = *(u_int32_t *)(pointer);			\
-		(pointer) = (u_int32_t *)(pointer) - 1;			\
-	} while (0)
-
-#define	DB_MULTIPLE_RECNO_NEXT(pointer, dbt, recno, retdata, retdlen)   \
-	do {								\
-		if (*((u_int32_t *)(pointer)) == (u_int32_t)0) {	\
-			recno = 0;					\
-			retdata = NULL;					\
-			pointer = NULL;					\
-			break;						\
-		}							\
-		recno = *(u_int32_t *)(pointer);			\
-		(pointer) = (u_int32_t *)(pointer) - 1;			\
-		retdata = (u_int8_t *)					\
-		    ((DBT *)(dbt))->data + *(u_int32_t *)(pointer);	\
-		(pointer) = (u_int32_t *)(pointer) - 1;			\
-		retdlen = *(u_int32_t *)(pointer);			\
-		(pointer) = (u_int32_t *)(pointer) - 1;			\
-	} while (0)
-
-/*******************************************************
- * Access method cursors.
- *******************************************************/
-struct __dbc {
-	DB *dbp;			/* Related DB access method. */
-	DB_TXN	 *txn;			/* Associated transaction. */
-
-	/*
-	 * Active/free cursor queues.
-	 *
-	 * !!!
-	 * Explicit representations of structures from queue.h.
-	 * TAILQ_ENTRY(__dbc) links;
-	 */
-	struct {
-		DBC *tqe_next;
-		DBC **tqe_prev;
-	} links;
-
-	/*
-	 * The DBT *'s below are used by the cursor routines to return
-	 * data to the user when DBT flags indicate that DB should manage
-	 * the returned memory.  They point at a DBT containing the buffer
-	 * and length that will be used, and "belonging" to the handle that
-	 * should "own" this memory.  This may be a "my_*" field of this
-	 * cursor--the default--or it may be the corresponding field of
-	 * another cursor, a DB handle, a join cursor, etc.  In general, it
-	 * will be whatever handle the user originally used for the current
-	 * DB interface call.
-	 */
-	DBT	 *rskey;		/* Returned secondary key. */
-	DBT	 *rkey;			/* Returned [primary] key. */
-	DBT	 *rdata;		/* Returned data. */
-
-	DBT	  my_rskey;		/* Space for returned secondary key. */
-	DBT	  my_rkey;		/* Space for returned [primary] key. */
-	DBT	  my_rdata;		/* Space for returned data. */
-
-	u_int32_t lid;			/* Default process' locker id. */
-	u_int32_t locker;		/* Locker for this operation. */
-	DBT	  lock_dbt;		/* DBT referencing lock. */
-	DB_LOCK_ILOCK lock;		/* Object to be locked. */
-	DB_LOCK	  mylock;		/* Lock held on this cursor. */
-
-	long	  cl_id;		/* Remote client id. */
-
-	DBTYPE	  dbtype;		/* Cursor type. */
-
-	DBC_INTERNAL *internal;		/* Access method private. */
-
-	int (*c_close) __P((DBC *));	/* Methods: public. */
-	int (*c_count) __P((DBC *, db_recno_t *, u_int32_t));
-	int (*c_del) __P((DBC *, u_int32_t));
-	int (*c_dup) __P((DBC *, DBC **, u_int32_t));
-	int (*c_get) __P((DBC *, DBT *, DBT *, u_int32_t));
-	int (*c_pget) __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
-	int (*c_put) __P((DBC *, DBT *, DBT *, u_int32_t));
-
-					/* Methods: private. */
-	int (*c_am_bulk) __P((DBC *, DBT *, u_int32_t));
-	int (*c_am_close) __P((DBC *, db_pgno_t, int *));
-	int (*c_am_del) __P((DBC *));
-	int (*c_am_destroy) __P((DBC *));
-	int (*c_am_get) __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-	int (*c_am_put) __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-	int (*c_am_writelock) __P((DBC *));
-
-	/* Private: for secondary indices. */
-	int (*c_real_get) __P((DBC *, DBT *, DBT *, u_int32_t));
-
-#define	DBC_ACTIVE	 0x0001		/* Cursor in use. */
-#define	DBC_COMPENSATE	 0x0002		/* Cursor compensating, don't lock. */
-#define	DBC_DIRTY_READ	 0x0004		/* Cursor supports dirty reads. */
-#define	DBC_OPD		 0x0008		/* Cursor references off-page dups. */
-#define	DBC_RECOVER	 0x0010		/* Recovery cursor; don't log/lock. */
-#define	DBC_RMW		 0x0020		/* Acquire write flag in read op. */
-#define	DBC_TRANSIENT	 0x0040		/* Cursor is transient. */
-#define	DBC_WRITECURSOR	 0x0080		/* Cursor may be used to write (CDB). */
-#define	DBC_WRITEDUP	 0x0100		/* idup'ed DBC_WRITECURSOR (CDB). */
-#define	DBC_WRITER	 0x0200		/* Cursor immediately writing (CDB). */
-#define	DBC_MULTIPLE	 0x0400		/* Return Multiple data. */
-#define	DBC_MULTIPLE_KEY 0x0800		/* Return Multiple keys and data. */
-#define	DBC_OWN_LID	 0x1000		/* Free lock id on destroy. */
-	u_int32_t flags;
-};
-
-/* Key range statistics structure */
-struct __key_range {
-	double less;
-	double equal;
-	double greater;
-};
-
-/* Btree/Recno statistics structure. */
-struct __db_bt_stat {
-	u_int32_t bt_magic;		/* Magic number. */
-	u_int32_t bt_version;		/* Version number. */
-	u_int32_t bt_metaflags;		/* Metadata flags. */
-	u_int32_t bt_nkeys;		/* Number of unique keys. */
-	u_int32_t bt_ndata;		/* Number of data items. */
-	u_int32_t bt_pagesize;		/* Page size. */
-	u_int32_t bt_maxkey;		/* Maxkey value. */
-	u_int32_t bt_minkey;		/* Minkey value. */
-	u_int32_t bt_re_len;		/* Fixed-length record length. */
-	u_int32_t bt_re_pad;		/* Fixed-length record pad. */
-	u_int32_t bt_levels;		/* Tree levels. */
-	u_int32_t bt_int_pg;		/* Internal pages. */
-	u_int32_t bt_leaf_pg;		/* Leaf pages. */
-	u_int32_t bt_dup_pg;		/* Duplicate pages. */
-	u_int32_t bt_over_pg;		/* Overflow pages. */
-	u_int32_t bt_free;		/* Pages on the free list. */
-	u_int32_t bt_int_pgfree;	/* Bytes free in internal pages. */
-	u_int32_t bt_leaf_pgfree;	/* Bytes free in leaf pages. */
-	u_int32_t bt_dup_pgfree;	/* Bytes free in duplicate pages. */
-	u_int32_t bt_over_pgfree;	/* Bytes free in overflow pages. */
-};
-
-/* Hash statistics structure. */
-struct __db_h_stat {
-	u_int32_t hash_magic;		/* Magic number. */
-	u_int32_t hash_version;		/* Version number. */
-	u_int32_t hash_metaflags;	/* Metadata flags. */
-	u_int32_t hash_nkeys;		/* Number of unique keys. */
-	u_int32_t hash_ndata;		/* Number of data items. */
-	u_int32_t hash_pagesize;	/* Page size. */
-	u_int32_t hash_ffactor;		/* Fill factor specified at create. */
-	u_int32_t hash_buckets;		/* Number of hash buckets. */
-	u_int32_t hash_free;		/* Pages on the free list. */
-	u_int32_t hash_bfree;		/* Bytes free on bucket pages. */
-	u_int32_t hash_bigpages;	/* Number of big key/data pages. */
-	u_int32_t hash_big_bfree;	/* Bytes free on big item pages. */
-	u_int32_t hash_overflows;	/* Number of overflow pages. */
-	u_int32_t hash_ovfl_free;	/* Bytes free on ovfl pages. */
-	u_int32_t hash_dup;		/* Number of dup pages. */
-	u_int32_t hash_dup_free;	/* Bytes free on duplicate pages. */
-};
-
-/* Queue statistics structure. */
-struct __db_qam_stat {
-	u_int32_t qs_magic;		/* Magic number. */
-	u_int32_t qs_version;		/* Version number. */
-	u_int32_t qs_metaflags;		/* Metadata flags. */
-	u_int32_t qs_nkeys;		/* Number of unique keys. */
-	u_int32_t qs_ndata;		/* Number of data items. */
-	u_int32_t qs_pagesize;		/* Page size. */
-	u_int32_t qs_extentsize;	/* Pages per extent. */
-	u_int32_t qs_pages;		/* Data pages. */
-	u_int32_t qs_re_len;		/* Fixed-length record length. */
-	u_int32_t qs_re_pad;		/* Fixed-length record pad. */
-	u_int32_t qs_pgfree;		/* Bytes free in data pages. */
-	u_int32_t qs_first_recno;	/* First not deleted record. */
-	u_int32_t qs_cur_recno;		/* Next available record number. */
-};
-
-/*******************************************************
- * Environment.
- *******************************************************/
-#define	DB_REGION_MAGIC	0x120897	/* Environment magic number. */
-
-typedef enum {
-	DB_NOTICE_LOGFILE_CHANGED
-} db_notices;
-
-/* Database Environment handle. */
-struct __db_env {
-	/*******************************************************
-	 * Public: owned by the application.
-	 *******************************************************/
-	FILE		*db_errfile;	/* Error message file stream. */
-	const char	*db_errpfx;	/* Error message prefix. */
-					/* Callbacks. */
-	void (*db_errcall) __P((const char *, char *));
-	void (*db_feedback) __P((DB_ENV *, int, int));
-	void (*db_paniccall) __P((DB_ENV *, int));
-	void (*db_noticecall) __P((DB_ENV *, db_notices));
-
-					/* App-specified alloc functions. */
-	void *(*db_malloc) __P((size_t));
-	void *(*db_realloc) __P((void *, size_t));
-	void (*db_free) __P((void *));
-
-	/*
-	 * Currently, the verbose list is a bit field with room for 32
-	 * entries.  There's no reason that it needs to be limited, if
-	 * there are ever more than 32 entries, convert to a bit array.
-	 */
-#define	DB_VERB_CHKPOINT	0x0001	/* List checkpoints. */
-#define	DB_VERB_DEADLOCK	0x0002	/* Deadlock detection information. */
-#define	DB_VERB_RECOVERY	0x0004	/* Recovery information. */
-#define	DB_VERB_REPLICATION	0x0008	/* Replication information. */
-#define	DB_VERB_WAITSFOR	0x0010	/* Dump waits-for table. */
-	u_int32_t	 verbose;	/* Verbose output. */
-
-	void		*app_private;	/* Application-private handle. */
-
-	int (*app_dispatch)		/* User-specified recovery dispatch. */
-	    __P((DB_ENV *, DBT *, DB_LSN *, db_recops));
-
-	/* Locking. */
-	u_int8_t	*lk_conflicts;	/* Two dimensional conflict matrix. */
-	u_int32_t	 lk_modes;	/* Number of lock modes in table. */
-	u_int32_t	 lk_max;	/* Maximum number of locks. */
-	u_int32_t	 lk_max_lockers;/* Maximum number of lockers. */
-	u_int32_t	 lk_max_objects;/* Maximum number of locked objects. */
-	u_int32_t	 lk_detect;	/* Deadlock detect on all conflicts. */
-	db_timeout_t	 lk_timeout;	/* Lock timeout period. */
-
-	/* Logging. */
-	u_int32_t	 lg_bsize;	/* Buffer size. */
-	u_int32_t	 lg_size;	/* Log file size. */
-	u_int32_t	 lg_regionmax;	/* Region size. */
-
-	/* Memory pool. */
-	u_int32_t	 mp_gbytes;	/* Cachesize: GB. */
-	u_int32_t	 mp_bytes;	/* Cachesize: Bytes. */
-	size_t		 mp_size;	/* DEPRECATED: Cachesize: bytes. */
-	int		 mp_ncache;	/* Number of cache regions. */
-	size_t		 mp_mmapsize;	/* Maximum file size for mmap. */
-
-	int		 rep_eid;	/* environment id. */
-
-	/* Transactions. */
-	u_int32_t	 tx_max;	/* Maximum number of transactions. */
-	time_t		 tx_timestamp;	/* Recover to specific timestamp. */
-	db_timeout_t	 tx_timeout;	/* Timeout for transactions. */
-
-	/*******************************************************
-	 * Private: owned by DB.
-	 *******************************************************/
-	int		 panic_errval;	/* Panic causing errno. */
-
-					/* User files, paths. */
-	char		*db_home;	/* Database home. */
-	char		*db_log_dir;	/* Database log file directory. */
-	char		*db_tmp_dir;	/* Database tmp file directory. */
-
-	char	       **db_data_dir;	/* Database data file directories. */
-	int		 data_cnt;	/* Database data file slots. */
-	int		 data_next;	/* Next Database data file slot. */
-
-	int		 db_mode;	/* Default open permissions. */
-
-	void		*reginfo;	/* REGINFO structure reference. */
-	DB_FH		*lockfhp;	/* fcntl(2) locking file handle. */
-
-	int	      (**recover_dtab)	/* Dispatch table for recover funcs. */
-			    __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-	size_t		 recover_dtab_size;
-					/* Slots in the dispatch table. */
-
-	void		*cl_handle;	/* RPC: remote client handle. */
-	long		 cl_id;		/* RPC: remote client env id. */
-
-	int		 db_ref;	/* DB reference count. */
-
-	long		 shm_key;	/* shmget(2) key. */
-	u_int32_t	 tas_spins;	/* test-and-set spins. */
-
-	/*
-	 * List of open DB handles for this DB_ENV, used for cursor
-	 * adjustment.  Must be protected for multi-threaded support.
-	 *
-	 * !!!
-	 * As this structure is allocated in per-process memory, the
-	 * mutex may need to be stored elsewhere on architectures unable
-	 * to support mutexes in heap memory, e.g. HP/UX 9.
-	 *
-	 * !!!
-	 * Explicit representation of structure in queue.h.
-	 * LIST_HEAD(dblist, __db);
-	 */
-	DB_MUTEX	*dblist_mutexp;	/* Mutex. */
-	struct {
-		struct __db *lh_first;
-	} dblist;
-
-	/*
-	 * XA support.
-	 *
-	 * !!!
-	 * Explicit representations of structures from queue.h.
-	 * TAILQ_ENTRY(__db_env) links;
-	 */
-	struct {
-		struct __db_env *tqe_next;
-		struct __db_env **tqe_prev;
-	} links;
-	int		 xa_rmid;	/* XA Resource Manager ID. */
-	DB_TXN		*xa_txn;	/* XA Current transaction. */
-
-	/* API-private structure. */
-	void		*api1_internal;	/* C++, Perl API private */
-	void		*api2_internal;	/* Java API private */
-
-	char		*passwd;	/* Cryptography support. */
-	size_t		 passwd_len;
-	void		*crypto_handle;	/* Primary handle. */
-	DB_MUTEX	*mt_mutexp;	/* Mersenne Twister mutex. */
-	int		 mti;		/* Mersenne Twister index. */
-	u_long		*mt;		/* Mersenne Twister state vector. */
-
-					/* DB_ENV Methods. */
-	int  (*close) __P((DB_ENV *, u_int32_t));
-	int  (*dbremove) __P((DB_ENV *,
-	    DB_TXN *, const char *, const char *, u_int32_t));
-	int  (*dbrename) __P((DB_ENV *, DB_TXN *,
-	    const char *, const char *, const char *, u_int32_t));
-	void (*err) __P((const DB_ENV *, int, const char *, ...));
-	void (*errx) __P((const DB_ENV *, const char *, ...));
-	int  (*open) __P((DB_ENV *, const char *, u_int32_t, int));
-	int  (*remove) __P((DB_ENV *, const char *, u_int32_t));
-	int  (*set_data_dir) __P((DB_ENV *, const char *));
-	int  (*set_alloc) __P((DB_ENV *, void *(*)(size_t),
-		void *(*)(void *, size_t), void (*)(void *)));
-	int  (*set_app_dispatch) __P((DB_ENV *,
-		int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)));
-	int  (*set_encrypt) __P((DB_ENV *, const char *, u_int32_t));
-	void (*set_errcall) __P((DB_ENV *, void (*)(const char *, char *)));
-	void (*set_errfile) __P((DB_ENV *, FILE *));
-	void (*set_errpfx) __P((DB_ENV *, const char *));
-	int  (*set_feedback) __P((DB_ENV *, void (*)(DB_ENV *, int, int)));
-	int  (*set_flags) __P((DB_ENV *, u_int32_t, int));
-	void (*set_noticecall) __P((DB_ENV *, void (*)(DB_ENV *, db_notices)));
-	int  (*set_paniccall) __P((DB_ENV *, void (*)(DB_ENV *, int)));
-	int  (*set_rpc_server) __P((DB_ENV *,
-		void *, const char *, long, long, u_int32_t));
-	int  (*set_shm_key) __P((DB_ENV *, long));
-	int  (*set_tas_spins) __P((DB_ENV *, u_int32_t));
-	int  (*set_tmp_dir) __P((DB_ENV *, const char *));
-	int  (*set_verbose) __P((DB_ENV *, u_int32_t, int));
-
-	void *lg_handle;		/* Log handle and methods. */
-	int  (*set_lg_bsize) __P((DB_ENV *, u_int32_t));
-	int  (*set_lg_dir) __P((DB_ENV *, const char *));
-	int  (*set_lg_max) __P((DB_ENV *, u_int32_t));
-	int  (*set_lg_regionmax) __P((DB_ENV *, u_int32_t));
-	int  (*log_archive) __P((DB_ENV *, char **[], u_int32_t));
-	int  (*log_cursor) __P((DB_ENV *, DB_LOGC **, u_int32_t));
-	int  (*log_file) __P((DB_ENV *, const DB_LSN *, char *, size_t));
-	int  (*log_flush) __P((DB_ENV *, const DB_LSN *));
-	int  (*log_put) __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
-	int  (*log_stat) __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
-
-	void *lk_handle;		/* Lock handle and methods. */
-	int  (*set_lk_conflicts) __P((DB_ENV *, u_int8_t *, int));
-	int  (*set_lk_detect) __P((DB_ENV *, u_int32_t));
-	int  (*set_lk_max) __P((DB_ENV *, u_int32_t));
-	int  (*set_lk_max_locks) __P((DB_ENV *, u_int32_t));
-	int  (*set_lk_max_lockers) __P((DB_ENV *, u_int32_t));
-	int  (*set_lk_max_objects) __P((DB_ENV *, u_int32_t));
-	int  (*lock_detect) __P((DB_ENV *, u_int32_t, u_int32_t, int *));
-	int  (*lock_dump_region) __P((DB_ENV *, char *, FILE *));
-	int  (*lock_get) __P((DB_ENV *,
-		u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
-	int  (*lock_put) __P((DB_ENV *, DB_LOCK *));
-	int  (*lock_id) __P((DB_ENV *, u_int32_t *));
-	int  (*lock_id_free) __P((DB_ENV *, u_int32_t));
-	int  (*lock_id_set) __P((DB_ENV *, u_int32_t, u_int32_t));
-	int  (*lock_stat) __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
-	int  (*lock_vec) __P((DB_ENV *,
-		u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
-	int  (*lock_downgrade) __P((DB_ENV *,
-		DB_LOCK *, db_lockmode_t, u_int32_t));
-
-	void *mp_handle;		/* Mpool handle and methods. */
-	int  (*set_mp_mmapsize) __P((DB_ENV *, size_t));
-	int  (*set_cachesize) __P((DB_ENV *, u_int32_t, u_int32_t, int));
-	int  (*memp_dump_region) __P((DB_ENV *, char *, FILE *));
-	int  (*memp_fcreate) __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
-	int  (*memp_nameop) __P((DB_ENV *,
-		u_int8_t *, const char *, const char *, const char *));
-	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_stat) __P((DB_ENV *,
-		DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
-	int  (*memp_sync) __P((DB_ENV *, DB_LSN *));
-	int  (*memp_trickle) __P((DB_ENV *, int, int *));
-
-	void *rep_handle;		/* Replication handle and methods. */
-	int  (*rep_elect) __P((DB_ENV *, int, int, u_int32_t, int *));
-	int  (*rep_flush) __P((DB_ENV *));
-	int  (*rep_process_message) __P((DB_ENV *, DBT *, DBT *, int *));
-	int  (*rep_start) __P((DB_ENV *, DBT *, u_int32_t));
-	int  (*rep_stat) __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
-	int  (*set_rep_election) __P((DB_ENV *,
-		u_int32_t, u_int32_t, u_int32_t, u_int32_t));
-	int  (*set_rep_limit) __P((DB_ENV *, u_int32_t, u_int32_t));
-	int  (*set_rep_request) __P((DB_ENV *, u_int32_t, u_int32_t));
-	int  (*set_rep_timeout) __P((DB_ENV *, u_int32_t, u_int32_t));
-	int  (*set_rep_transport) __P((DB_ENV *, int,
-		int (*) (DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
-
-	void *tx_handle;		/* Txn handle and methods. */
-	int  (*set_tx_max) __P((DB_ENV *, u_int32_t));
-	int  (*set_tx_timestamp) __P((DB_ENV *, time_t *));
-	int  (*txn_begin) __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
-	int  (*txn_checkpoint) __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
-	int  (*txn_id_set) __P((DB_ENV *, u_int32_t, u_int32_t));
-	int  (*txn_recover) __P((DB_ENV *,
-		DB_PREPLIST *, long, long *, u_int32_t));
-	int  (*txn_stat) __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
-	int  (*set_timeout) __P((DB_ENV *, db_timeout_t, u_int32_t));
-
-#define	DB_TEST_ELECTINIT	 1	/* after __rep_elect_init */
-#define	DB_TEST_ELECTSEND	 2	/* after REP_ELECT msgnit */
-#define	DB_TEST_ELECTVOTE1	 3	/* after __rep_send_vote 1 */
-#define	DB_TEST_ELECTVOTE2	 4	/* after __rep_wait */
-#define	DB_TEST_ELECTWAIT1	 5	/* after REP_VOTE2 */
-#define	DB_TEST_ELECTWAIT2	 6	/* after __rep_wait 2 */
-#define	DB_TEST_PREDESTROY	 7	/* before destroy op */
-#define	DB_TEST_PREOPEN		 8	/* before __os_open */
-#define	DB_TEST_POSTDESTROY	 9	/* after destroy op */
-#define	DB_TEST_POSTLOG		 10	/* after logging all pages */
-#define	DB_TEST_POSTLOGMETA	 11	/* after logging meta in btree */
-#define	DB_TEST_POSTOPEN	 12	/* after __os_open */
-#define	DB_TEST_POSTSYNC	 13	/* after syncing the log */
-#define	DB_TEST_SUBDB_LOCKS	 14	/* subdb locking tests */
-	int		 test_abort;	/* Abort value for testing. */
-	int		 test_copy;	/* Copy value for testing. */
-
-#define	DB_ENV_AUTO_COMMIT	0x0000001 /* DB_AUTO_COMMIT. */
-#define	DB_ENV_CDB		0x0000002 /* DB_INIT_CDB. */
-#define	DB_ENV_CDB_ALLDB	0x0000004 /* CDB environment wide locking. */
-#define	DB_ENV_CREATE		0x0000008 /* DB_CREATE set. */
-#define	DB_ENV_DBLOCAL		0x0000010 /* DB_ENV allocated for private DB. */
-#define	DB_ENV_DIRECT_DB	0x0000020 /* DB_DIRECT_DB set. */
-#define	DB_ENV_DIRECT_LOG	0x0000040 /* DB_DIRECT_LOG set. */
-#define	DB_ENV_FATAL		0x0000080 /* Doing fatal recovery in env. */
-#define	DB_ENV_LOCKDOWN		0x0000100 /* DB_LOCKDOWN set. */
-#define	DB_ENV_NOLOCKING	0x0000200 /* DB_NOLOCKING set. */
-#define	DB_ENV_NOMMAP		0x0000400 /* DB_NOMMAP set. */
-#define	DB_ENV_NOPANIC		0x0000800 /* Okay if panic set. */
-#define	DB_ENV_OPEN_CALLED	0x0001000 /* DB_ENV->open called. */
-#define	DB_ENV_OVERWRITE	0x0002000 /* DB_OVERWRITE set. */
-#define	DB_ENV_PRIVATE		0x0004000 /* DB_PRIVATE set. */
-#define	DB_ENV_REGION_INIT	0x0008000 /* DB_REGION_INIT set. */
-#define	DB_ENV_REP_CLIENT	0x0010000 /* Replication client. */
-#define	DB_ENV_REP_LOGSONLY	0x0020000 /* Log files only replication site. */
-#define	DB_ENV_REP_MASTER	0x0040000 /* Replication master. */
-#define	DB_ENV_RPCCLIENT	0x0080000 /* DB_CLIENT set. */
-#define	DB_ENV_RPCCLIENT_GIVEN	0x0100000 /* User-supplied RPC client struct */
-#define	DB_ENV_SYSTEM_MEM	0x0200000 /* DB_SYSTEM_MEM set. */
-#define	DB_ENV_THREAD		0x0400000 /* DB_THREAD set. */
-#define	DB_ENV_TXN_NOSYNC	0x0800000 /* DB_TXN_NOSYNC set. */
-#define	DB_ENV_TXN_WRITE_NOSYNC	0x1000000 /* DB_TXN_WRITE_NOSYNC set. */
-#define	DB_ENV_YIELDCPU		0x2000000 /* DB_YIELDCPU set. */
-	u_int32_t flags;
-};
-
-#ifndef DB_DBM_HSEARCH
-#define	DB_DBM_HSEARCH	0		/* No historic interfaces by default. */
-#endif
-#if DB_DBM_HSEARCH != 0
-/*******************************************************
- * Dbm/Ndbm historic interfaces.
- *******************************************************/
-typedef struct __db DBM;
-
-#define	DBM_INSERT	0		/* Flags to dbm_store(). */
-#define	DBM_REPLACE	1
-
-/*
- * The DB support for ndbm(3) always appends this suffix to the
- * file name to avoid overwriting the user's original database.
- */
-#define	DBM_SUFFIX	".db"
-
-#if defined(_XPG4_2)
-typedef struct {
-	char *dptr;
-	size_t dsize;
-} datum;
-#else
-typedef struct {
-	char *dptr;
-	int dsize;
-} datum;
-#endif
-
-/*
- * Translate NDBM calls into DB calls so that DB doesn't step on the
- * application's name space.
- */
-#define	dbm_clearerr(a)		__db_ndbm_clearerr@DB_VERSION_UNIQUE_NAME@(a)
-#define	dbm_close(a)		__db_ndbm_close@DB_VERSION_UNIQUE_NAME@(a)
-#define	dbm_delete(a, b)	__db_ndbm_delete@DB_VERSION_UNIQUE_NAME@(a, b)
-#define	dbm_dirfno(a)		__db_ndbm_dirfno@DB_VERSION_UNIQUE_NAME@(a)
-#define	dbm_error(a)		__db_ndbm_error@DB_VERSION_UNIQUE_NAME@(a)
-#define	dbm_fetch(a, b)		__db_ndbm_fetch@DB_VERSION_UNIQUE_NAME@(a, b)
-#define	dbm_firstkey(a)		__db_ndbm_firstkey@DB_VERSION_UNIQUE_NAME@(a)
-#define	dbm_nextkey(a)		__db_ndbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
-#define	dbm_open(a, b, c)	__db_ndbm_open@DB_VERSION_UNIQUE_NAME@(a, b, c)
-#define	dbm_pagfno(a)		__db_ndbm_pagfno@DB_VERSION_UNIQUE_NAME@(a)
-#define	dbm_rdonly(a)		__db_ndbm_rdonly@DB_VERSION_UNIQUE_NAME@(a)
-#define	dbm_store(a, b, c, d) \
-	__db_ndbm_store@DB_VERSION_UNIQUE_NAME@(a, b, c, d)
-
-/*
- * Translate DBM calls into DB calls so that DB doesn't step on the
- * application's name space.
- *
- * The global variables dbrdonly, dirf and pagf were not retained when 4BSD
- * replaced the dbm interface with ndbm, and are not supported here.
- */
-#define	dbminit(a)	__db_dbm_init@DB_VERSION_UNIQUE_NAME@(a)
-#define	dbmclose	__db_dbm_close@DB_VERSION_UNIQUE_NAME@
-#if !defined(__cplusplus)
-#define	delete(a)	__db_dbm_delete@DB_VERSION_UNIQUE_NAME@(a)
-#endif
-#define	fetch(a)	__db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a)
-#define	firstkey	__db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
-#define	nextkey(a)	__db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a)
-#define	store(a, b)	__db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b)
-
-/*******************************************************
- * Hsearch historic interface.
- *******************************************************/
-typedef enum {
-	FIND, ENTER
-} ACTION;
-
-typedef struct entry {
-	char *key;
-	char *data;
-} ENTRY;
-
-#define	hcreate(a)	__db_hcreate@DB_VERSION_UNIQUE_NAME@(a)
-#define	hdestroy	__db_hdestroy@DB_VERSION_UNIQUE_NAME@
-#define	hsearch(a, b)	__db_hsearch@DB_VERSION_UNIQUE_NAME@(a, b)
-
-#endif /* DB_DBM_HSEARCH */
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_DB_H_ */
diff --git a/bdb/dbinc/db_185.in b/bdb/dbinc/db_185.in
deleted file mode 100644
index 86e2290c304..00000000000
--- a/bdb/dbinc/db_185.in
+++ /dev/null
@@ -1,169 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- */
-/*
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: db_185.in,v 11.8 2002/01/11 15:52:24 bostic Exp $
- */
-
-#ifndef _DB_185_H_
-#define	_DB_185_H_
-
-#include <sys/types.h>
-
-#include <limits.h>
-
-/*
- * XXX
- * Handle function prototypes and the keyword "const".  This steps on name
- * space that DB doesn't control, but all of the other solutions are worse.
- */
-#undef	__P
-#if defined(__STDC__) || defined(__cplusplus)
-#define	__P(protos)	protos		/* ANSI C prototypes */
-#else
-#define	const
-#define	__P(protos)	()		/* K&R C preprocessor */
-#endif
-
-#define	RET_ERROR	-1		/* Return values. */
-#define	RET_SUCCESS	 0
-#define	RET_SPECIAL	 1
-
-#ifndef	__BIT_TYPES_DEFINED__
-#define	__BIT_TYPES_DEFINED__
-@u_int8_decl@
-@int16_decl@
-@u_int16_decl@
-@int32_decl@
-@u_int32_decl@
-#endif
-
-/*
- * XXX
- * SGI/IRIX already has a pgno_t.
- */
-#ifdef	sgi
-#define	pgno_t	db_pgno_t
-#endif
-
-#define	MAX_PAGE_NUMBER	0xffffffff	/* >= # of pages in a file */
-typedef u_int32_t	pgno_t;
-#define	MAX_PAGE_OFFSET	65535		/* >= # of bytes in a page */
-typedef u_int16_t	indx_t;
-#define	MAX_REC_NUMBER	0xffffffff	/* >= # of records in a tree */
-typedef u_int32_t	recno_t;
-
-/* Key/data structure -- a Data-Base Thang. */
-typedef struct {
-	void	*data;			/* data */
-	size_t	 size;			/* data length */
-} DBT;
-
-/* Routine flags. */
-#define	R_CURSOR	1		/* del, put, seq */
-#define	__R_UNUSED	2		/* UNUSED */
-#define	R_FIRST		3		/* seq */
-#define	R_IAFTER	4		/* put (RECNO) */
-#define	R_IBEFORE	5		/* put (RECNO) */
-#define	R_LAST		6		/* seq (BTREE, RECNO) */
-#define	R_NEXT		7		/* seq */
-#define	R_NOOVERWRITE	8		/* put */
-#define	R_PREV		9		/* seq (BTREE, RECNO) */
-#define	R_SETCURSOR	10		/* put (RECNO) */
-#define	R_RECNOSYNC	11		/* sync (RECNO) */
-
-typedef enum { DB_BTREE, DB_HASH, DB_RECNO } DBTYPE;
-
-/* Access method description structure. */
-typedef struct __db {
-	DBTYPE type;			/* Underlying db type. */
-	int (*close)	__P((struct __db *));
-	int (*del)	__P((const struct __db *, const DBT *, u_int));
-	int (*get)	__P((const struct __db *, const DBT *, DBT *, u_int));
-	int (*put)	__P((const struct __db *, DBT *, const DBT *, u_int));
-	int (*seq)	__P((const struct __db *, DBT *, DBT *, u_int));
-	int (*sync)	__P((const struct __db *, u_int));
-	void *internal;			/* Access method private. */
-	int (*fd)	__P((const struct __db *));
-} DB;
-
-#define	BTREEMAGIC	0x053162
-#define	BTREEVERSION	3
-
-/* Structure used to pass parameters to the btree routines. */
-typedef struct {
-#define	R_DUP		0x01	/* duplicate keys */
-	u_int32_t flags;
-	u_int32_t cachesize;	/* bytes to cache */
-	u_int32_t maxkeypage;	/* maximum keys per page */
-	u_int32_t minkeypage;	/* minimum keys per page */
-	u_int32_t psize;	/* page size */
-	int	(*compare)	/* comparison function */
-	    __P((const DBT *, const DBT *));
-	size_t	(*prefix)	/* prefix function */
-	    __P((const DBT *, const DBT *));
-	int	lorder;		/* byte order */
-} BTREEINFO;
-
-#define	HASHMAGIC	0x061561
-#define	HASHVERSION	2
-
-/* Structure used to pass parameters to the hashing routines. */
-typedef struct {
-	u_int32_t bsize;	/* bucket size */
-	u_int32_t ffactor;	/* fill factor */
-	u_int32_t nelem;	/* number of elements */
-	u_int32_t cachesize;	/* bytes to cache */
-	u_int32_t		/* hash function */
-		(*hash) __P((const void *, size_t));
-	int	lorder;		/* byte order */
-} HASHINFO;
-
-/* Structure used to pass parameters to the record routines. */
-typedef struct {
-#define	R_FIXEDLEN	0x01	/* fixed-length records */
-#define	R_NOKEY		0x02	/* key not required */
-#define	R_SNAPSHOT	0x04	/* snapshot the input */
-	u_int32_t flags;
-	u_int32_t cachesize;	/* bytes to cache */
-	u_int32_t psize;	/* page size */
-	int	lorder;		/* byte order */
-	size_t	reclen;		/* record length (fixed-length records) */
-	u_char	bval;		/* delimiting byte (variable-length records */
-	char	*bfname;	/* btree file name */
-} RECNOINFO;
-
-/* Re-define the user's dbopen calls. */
-#define dbopen __db185_open@DB_VERSION_UNIQUE_NAME@
-
-#endif /* !_DB_185_H_ */
diff --git a/bdb/dbinc/db_am.h b/bdb/dbinc/db_am.h
deleted file mode 100644
index c5aa424255d..00000000000
--- a/bdb/dbinc/db_am.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: db_am.h,v 11.61 2002/08/08 03:20:46 bostic Exp $
- */
-#ifndef _DB_AM_H_
-#define	_DB_AM_H_
-
-/*
- * IS_AUTO_COMMIT --
- *	Test for local auto-commit flag or global flag with no local DbTxn
- *	handle.
- */
-#define	IS_AUTO_COMMIT(dbenv, txn, flags)				\
-	(LF_ISSET(DB_AUTO_COMMIT) ||					\
-	    ((txn) == NULL && F_ISSET((dbenv), DB_ENV_AUTO_COMMIT)))
-
-/* DB recovery operation codes. */
-#define	DB_ADD_DUP	1
-#define	DB_REM_DUP	2
-#define	DB_ADD_BIG	3
-#define	DB_REM_BIG	4
-#define	DB_ADD_PAGE	5
-#define	DB_REM_PAGE	6
-
-/*
- * Standard initialization and shutdown macros for all recovery functions.
- */
-#define	REC_INTRO(func, inc_count) {					\
-	argp = NULL;							\
-	dbc = NULL;							\
-	file_dbp = NULL;						\
-	mpf = NULL;							\
-	if ((ret = func(dbenv, dbtp->data, &argp)) != 0)		\
-		goto out;						\
-	if ((ret = __dbreg_id_to_db(dbenv, argp->txnid,		\
-	    &file_dbp, argp->fileid, inc_count)) != 0) {		\
-		if (ret	== DB_DELETED) {				\
-			ret = 0;					\
-			goto done;					\
-		}							\
-		goto out;						\
-	}								\
-	if ((ret = file_dbp->cursor(file_dbp, NULL, &dbc, 0)) != 0)	\
-		goto out;						\
-	F_SET(dbc, DBC_RECOVER);					\
-	mpf = file_dbp->mpf;						\
-}
-
-#define	REC_CLOSE {							\
-	int __t_ret;							\
-	if (argp != NULL)						\
-		__os_free(dbenv, argp);					\
-	if (dbc != NULL &&						\
-	    (__t_ret = dbc->c_close(dbc)) != 0 && ret == 0)		\
-		ret = __t_ret;						\
-	return (ret);							\
-}
-
-/*
- * No-op versions of the same macros.
- */
-#define	REC_NOOP_INTRO(func) {						\
-	argp = NULL;							\
-	if ((ret = func(dbenv, dbtp->data, &argp)) != 0)		\
-		return (ret);						\
-}
-#define	REC_NOOP_CLOSE							\
-	if (argp != NULL)						\
-		__os_free(dbenv, argp);					\
-	return (ret);							\
-
-/*
- * Standard debugging macro for all recovery functions.
- */
-#ifdef DEBUG_RECOVER
-#define	REC_PRINT(func)							\
-	(void)func(dbenv, dbtp, lsnp, op, info);
-#else
-#define	REC_PRINT(func)
-#endif
-
-/*
- * Actions to __db_lget
- */
-#define	LCK_ALWAYS		1	/* Lock even for off page dup cursors */
-#define	LCK_COUPLE		2	/* Lock Couple */
-#define	LCK_COUPLE_ALWAYS	3	/* Lock Couple even in txn. */
-#define	LCK_DOWNGRADE		4	/* Downgrade the lock. (internal) */
-#define	LCK_ROLLBACK		5	/* Lock even if in rollback */
-
-/*
- * If doing transactions we have to hold the locks associated with a data item
- * from a page for the entire transaction.  However, we don't have to hold the
- * locks associated with walking the tree.  Distinguish between the two so that
- * we don't tie up the internal pages of the tree longer than necessary.
- */
-#define	__LPUT(dbc, lock)						\
-	(LOCK_ISSET(lock) ?						\
-	(dbc)->dbp->dbenv->lock_put((dbc)->dbp->dbenv, &(lock)) : 0)
-
-/*
- * __TLPUT -- transactional lock put
- *	If the lock is valid then
- *	   If we are not in a transaction put the lock.
- *	   Else if the cursor is doing dirty reads and this was a read then
- *		put the lock.
- *	   Else if the db is supporting dirty reads and this is a write then
- *		downgrade it.
- *	Else do nothing.
- */
-#define	__TLPUT(dbc, lock)						\
-	(LOCK_ISSET(lock) ? __db_lput(dbc, &(lock)) : 0)
-
-typedef struct {
-	DBC *dbc;
-	int count;
-} db_trunc_param;
-
-#include "dbinc/db_dispatch.h"
-#include "dbinc_auto/db_auto.h"
-#include "dbinc_auto/crdel_auto.h"
-#include "dbinc_auto/db_ext.h"
-#endif /* !_DB_AM_H_ */
diff --git a/bdb/dbinc/db_cxx.in b/bdb/dbinc/db_cxx.in
deleted file mode 100644
index 6752b36ec42..00000000000
--- a/bdb/dbinc/db_cxx.in
+++ /dev/null
@@ -1,795 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1997-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: db_cxx.in,v 11.113 2002/08/23 13:02:27 mjc Exp $
- */
-
-#ifndef _DB_CXX_H_
-#define	_DB_CXX_H_
-//
-// C++ assumptions:
-//
-// To ensure portability to many platforms, both new and old, we make
-// few assumptions about the C++ compiler and library.  For example,
-// we do not expect STL, templates or namespaces to be available.  The
-// "newest" C++ feature used is exceptions, which are used liberally
-// to transmit error information.  Even the use of exceptions can be
-// disabled at runtime, to do so, use the DB_CXX_NO_EXCEPTIONS flags
-// with the DbEnv or Db constructor.
-//
-// C++ naming conventions:
-//
-//  - All top level class names start with Db.
-//  - All class members start with lower case letter.
-//  - All private data members are suffixed with underscore.
-//  - Use underscores to divide names into multiple words.
-//  - Simple data accessors are named with get_ or set_ prefix.
-//  - All method names are taken from names of functions in the C
-//    layer of db (usually by dropping a prefix like "db_").
-//    These methods have the same argument types and order,
-//    other than dropping the explicit arg that acts as "this".
-//
-// As a rule, each DbFoo object has exactly one underlying DB_FOO struct
-// (defined in db.h) associated with it.  In some cases, we inherit directly
-// from the DB_FOO structure to make this relationship explicit.  Often,
-// the underlying C layer allocates and deallocates these structures, so
-// there is no easy way to add any data to the DbFoo class.  When you see
-// a comment about whether data is permitted to be added, this is what
-// is going on.  Of course, if we need to add data to such C++ classes
-// in the future, we will arrange to have an indirect pointer to the
-// DB_FOO struct (as some of the classes already have).
-//
-
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-//
-// Forward declarations
-//
-
-#include <stdarg.h>
-
-@cxx_have_stdheaders@
-#ifdef HAVE_CXX_STDHEADERS
-#include <iostream>
-#define	__DB_OSTREAMCLASS	std::ostream
-#else
-#include <iostream.h>
-#define	__DB_OSTREAMCLASS	ostream
-#endif
-
-#include "db.h"
-#include "cxx_common.h"
-#include "cxx_except.h"
-
-class Db;                                        // forward
-class Dbc;                                       // forward
-class DbEnv;                                     // forward
-class DbInfo;                                    // forward
-class DbLock;                                    // forward
-class DbLogc;                                    // forward
-class DbLsn;                                     // forward
-class DbMpoolFile;                               // forward
-class DbPreplist;                                // forward
-class Dbt;                                       // forward
-class DbTxn;                                     // forward
-
-// These classes are not defined here and should be invisible
-// to the user, but some compilers require forward references.
-// There is one for each use of the DEFINE_DB_CLASS macro.
-
-class DbImp;
-class DbEnvImp;
-class DbMpoolFileImp;
-class DbTxnImp;
-
-// DEFINE_DB_CLASS defines an imp_ data member and imp() accessor.
-// The underlying type is a pointer to an opaque *Imp class, that
-// gets converted to the correct implementation class by the implementation.
-//
-// Since these defines use "private/public" labels, and leave the access
-// being "private", we always use these by convention before any data
-// members in the private section of a class.  Keeping them in the
-// private section also emphasizes that they are off limits to user code.
-//
-#define	DEFINE_DB_CLASS(name) \
-	public: class name##Imp* imp() { return (imp_); } \
-	public: const class name##Imp* constimp() const { return (imp_); } \
-	private: class name##Imp* imp_
-
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-//
-// Turn off inappropriate compiler warnings
-//
-
-#ifdef _MSC_VER
-
-// These are level 4 warnings that are explicitly disabled.
-// With Visual C++, by default you do not see above level 3 unless
-// you use /W4.  But we like to compile with the highest level
-// warnings to catch other errors.
-//
-// 4201: nameless struct/union
-//       triggered by standard include file <winnt.h>
-//
-// 4514: unreferenced inline function has been removed
-//       certain include files in MSVC define methods that are not called
-//
-#pragma warning(disable: 4201 4514)
-
-#endif
-
-// Some interfaces can be customized by allowing users to define
-// callback functions.  For performance and logistical reasons, some
-// callback functions must be declared in extern "C" blocks.  For others,
-// we allow you to declare the callbacks in C++ or C (or an extern "C"
-// block) as you wish.  See the set methods for the callbacks for
-// the choices.
-//
-extern "C" {
-	typedef void * (*db_malloc_fcn_type)
-		(size_t);
-	typedef void * (*db_realloc_fcn_type)
-		(void *, size_t);
-	typedef void (*db_free_fcn_type)
-		(void *);
-	typedef int (*bt_compare_fcn_type)          /*C++ version available*/
-		(DB *, const DBT *, const DBT *);
-	typedef size_t (*bt_prefix_fcn_type)        /*C++ version available*/
-		(DB *, const DBT *, const DBT *);
-	typedef int (*dup_compare_fcn_type)         /*C++ version available*/
-		(DB *, const DBT *, const DBT *);
-	typedef u_int32_t (*h_hash_fcn_type)        /*C++ version available*/
-		(DB *, const void *, u_int32_t);
-	typedef int (*pgin_fcn_type)
-		(DB_ENV *dbenv, db_pgno_t pgno, void *pgaddr, DBT *pgcookie);
-	typedef int (*pgout_fcn_type)
-		(DB_ENV *dbenv, db_pgno_t pgno, void *pgaddr, DBT *pgcookie);
-};
-
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-//
-// Lock classes
-//
-
-class _exported DbLock
-{
-	friend class DbEnv;
-
-public:
-	DbLock();
-	DbLock(const DbLock &);
-	DbLock &operator = (const DbLock &);
-
-protected:
-	// We can add data to this class if needed
-	// since its contained class is not allocated by db.
-	// (see comment at top)
-
-	DbLock(DB_LOCK);
-	DB_LOCK lock_;
-};
-
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-//
-// Log classes
-//
-
-class _exported DbLsn : protected DB_LSN
-{
-	friend class DbEnv;          // friendship needed to cast to base class
-	friend class DbLogc;         // friendship needed to cast to base class
-};
-
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-//
-// Memory pool classes
-//
-
-class _exported DbMpoolFile
-{
-	friend class DbEnv;
-
-private:
-	// Put this first to allow inlining with some C++ compilers (g++-2.95)
-	DEFINE_DB_CLASS(DbMpoolFile);
-
-public:
-	int close(u_int32_t flags);
-	int get(db_pgno_t *pgnoaddr, u_int32_t flags, void *pagep);
-	void last_pgno(db_pgno_t *pgnoaddr);
-	int open(const char *file, u_int32_t flags, int mode, size_t pagesize);
-	int put(void *pgaddr, u_int32_t flags);
-	void refcnt(db_pgno_t *pgnoaddr);
-	int set(void *pgaddr, u_int32_t flags);
-	int set_clear_len(u_int32_t len);
-	int set_fileid(u_int8_t *fileid);
-	int set_ftype(int ftype);
-	int set_lsn_offset(int32_t offset);
-	int set_pgcookie(DBT *dbt);
-	void set_unlink(int);
-	int sync();
-
-	virtual DB_MPOOLFILE *get_DB_MPOOLFILE()
-	{
-		return (DB_MPOOLFILE *)imp();
-	}
-
-	virtual const DB_MPOOLFILE *get_const_DB_MPOOLFILE() const
-	{
-		return (const DB_MPOOLFILE *)constimp();
-	}
-
-private:
-	// We can add data to this class if needed
-	// since it is implemented via a pointer.
-	// (see comment at top)
-
-	// Note: use DbEnv::memp_fcreate() to get pointers to a DbMpoolFile,
-	// and call DbMpoolFile::close() rather than delete to release them.
-	//
-	DbMpoolFile();
-
-	// Shut g++ up.
-protected:
-	virtual ~DbMpoolFile();
-
-private:
-	// no copying
-	DbMpoolFile(const DbMpoolFile &);
-	void operator = (const DbMpoolFile &);
-};
-
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-//
-// This is filled in and returned by the DbEnv::txn_recover() method.
-//
-
-class _exported DbPreplist
-{
-public:
-	DbTxn *txn;
-	u_int8_t gid[DB_XIDDATASIZE];
-};
-
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-//
-// Transaction classes
-//
-
-class _exported DbTxn
-{
-	friend class DbEnv;
-
-private:
-	// Put this first to allow inlining with some C++ compilers (g++-2.95)
-	DEFINE_DB_CLASS(DbTxn);
-
-public:
-	int abort();
-	int commit(u_int32_t flags);
-	int discard(u_int32_t flags);
-	u_int32_t id();
-	int prepare(u_int8_t *gid);
-	int set_timeout(db_timeout_t timeout, u_int32_t flags);
-
-	virtual DB_TXN *get_DB_TXN()
-	{
-		return (DB_TXN *)imp();
-	}
-
-	virtual const DB_TXN *get_const_DB_TXN() const
-	{
-		return (const DB_TXN *)constimp();
-	}
-
-	static DbTxn* get_DbTxn(DB_TXN *txn)
-	{
-		return (DbTxn *)txn->api_internal;
-	}
-
-	static const DbTxn* get_const_DbTxn(const DB_TXN *txn)
-	{
-		return (const DbTxn *)txn->api_internal;
-	}
-
-	// For internal use only.
-	static DbTxn* wrap_DB_TXN(DB_TXN *txn);
-
-private:
-	// We can add data to this class if needed
-	// since it is implemented via a pointer.
-	// (see comment at top)
-
-	// Note: use DbEnv::txn_begin() to get pointers to a DbTxn,
-	// and call DbTxn::abort() or DbTxn::commit rather than
-	// delete to release them.
-	//
-	DbTxn();
-	// For internal use only.
-	DbTxn(DB_TXN *txn);
-	virtual ~DbTxn();
-
-	// no copying
-	DbTxn(const DbTxn &);
-	void operator = (const DbTxn &);
-};
-
-//
-// Berkeley DB environment class.  Provides functions for opening databases.
-// User of this library can use this class as a starting point for
-// developing a DB application - derive their application class from
-// this one, add application control logic.
-//
-// Note that if you use the default constructor, you must explicitly
-// call appinit() before any other db activity (e.g. opening files)
-//
-class _exported DbEnv
-{
-	friend class Db;
-	friend class DbLock;
-	friend class DbMpoolFile;
-
-private:
-	// Put this first to allow inlining with some C++ compilers (g++-2.95)
-	DEFINE_DB_CLASS(DbEnv);
-
-public:
-	// After using this constructor, you can set any needed
-	// parameters for the environment using the set_* methods.
-	// Then call open() to finish initializing the environment
-	// and attaching it to underlying files.
-	//
-	DbEnv(u_int32_t flags);
-
-	virtual ~DbEnv();
-
-	// These methods match those in the C interface.
-	//
-	virtual int close(u_int32_t);
-	virtual int dbremove(DbTxn *txn, const char *name, const char *subdb,
-	    u_int32_t flags);
-	virtual int dbrename(DbTxn *txn, const char *name, const char *subdb,
-	    const char *newname, u_int32_t flags);
-	virtual void err(int, const char *, ...);
-	virtual void errx(const char *, ...);
-	virtual void *get_app_private() const;
-	virtual int open(const char *, u_int32_t, int);
-	virtual int remove(const char *, u_int32_t);
-	virtual int set_alloc(db_malloc_fcn_type, db_realloc_fcn_type,
-		      db_free_fcn_type);
-	virtual void set_app_private(void *);
-	virtual int set_cachesize(u_int32_t, u_int32_t, int);
-	virtual int set_data_dir(const char *);
-	virtual int set_encrypt(const char *, int);
-	virtual void set_errcall(void (*)(const char *, char *));
-	virtual void set_errfile(FILE *);
-	virtual void set_errpfx(const char *);
-	virtual int set_flags(u_int32_t, int);
-	virtual int set_feedback(void (*)(DbEnv *, int, int));
-	virtual int set_lg_bsize(u_int32_t);
-	virtual int set_lg_dir(const char *);
-	virtual int set_lg_max(u_int32_t);
-	virtual int set_lg_regionmax(u_int32_t);
-	virtual int set_lk_conflicts(u_int8_t *, int);
-	virtual int set_lk_detect(u_int32_t);
-	virtual int set_lk_max(u_int32_t);
-	virtual int set_lk_max_lockers(u_int32_t);
-	virtual int set_lk_max_locks(u_int32_t);
-	virtual int set_lk_max_objects(u_int32_t);
-	virtual int set_mp_mmapsize(size_t);
-	virtual int set_paniccall(void (*)(DbEnv *, int));
-	virtual int set_rpc_server(void *, char *, long, long, u_int32_t);
-	virtual int set_shm_key(long);
-	virtual int set_timeout(db_timeout_t timeout, u_int32_t flags);
-	virtual int set_tmp_dir(const char *);
-	virtual int set_tas_spins(u_int32_t);
-	virtual int set_tx_max(u_int32_t);
-	virtual int set_app_dispatch(int (*)(DbEnv *,
-	    Dbt *, DbLsn *, db_recops));
-	virtual int set_tx_timestamp(time_t *);
-	virtual int set_verbose(u_int32_t which, int onoff);
-
-	// Version information.  A static method so it can be obtained anytime.
-	//
-	static char *version(int *major, int *minor, int *patch);
-
-	// Convert DB errors to strings
-	static char *strerror(int);
-
-	// If an error is detected and the error call function
-	// or stream is set, a message is dispatched or printed.
-	// If a prefix is set, each message is prefixed.
-	//
-	// You can use set_errcall() or set_errfile() above to control
-	// error functionality.  Alternatively, you can call
-	// set_error_stream() to force all errors to a C++ stream.
-	// It is unwise to mix these approaches.
-	//
-	virtual void set_error_stream(__DB_OSTREAMCLASS *);
-
-	// used internally
-	static void runtime_error(const char *caller, int err,
-				  int error_policy);
-	static void runtime_error_dbt(const char *caller, Dbt *dbt,
-				  int error_policy);
-	static void runtime_error_lock_get(const char *caller, int err,
-				  db_lockop_t op, db_lockmode_t mode,
-				  const Dbt *obj, DbLock lock, int index,
-				  int error_policy);
-
-	// Lock functions
-	//
-	virtual int lock_detect(u_int32_t flags, u_int32_t atype, int *aborted);
-	virtual int lock_get(u_int32_t locker, u_int32_t flags, const Dbt *obj,
-		     db_lockmode_t lock_mode, DbLock *lock);
-	virtual int lock_id(u_int32_t *idp);
-	virtual int lock_id_free(u_int32_t id);
-	virtual int lock_put(DbLock *lock);
-	virtual int lock_stat(DB_LOCK_STAT **statp, u_int32_t flags);
-	virtual int lock_vec(u_int32_t locker, u_int32_t flags, DB_LOCKREQ list[],
-		     int nlist, DB_LOCKREQ **elistp);
-
-	// Log functions
-	//
-	virtual int log_archive(char **list[], u_int32_t flags);
-	static int log_compare(const DbLsn *lsn0, const DbLsn *lsn1);
-	virtual int log_cursor(DbLogc **cursorp, u_int32_t flags);
-	virtual int log_file(DbLsn *lsn, char *namep, size_t len);
-	virtual int log_flush(const DbLsn *lsn);
-	virtual int log_put(DbLsn *lsn, const Dbt *data, u_int32_t flags);
-
-	virtual int log_stat(DB_LOG_STAT **spp, u_int32_t flags);
-
-	// Mpool functions
-	//
-	virtual int memp_fcreate(DbMpoolFile **dbmfp, u_int32_t flags);
-	virtual int memp_register(int ftype,
-			  pgin_fcn_type pgin_fcn,
-			  pgout_fcn_type pgout_fcn);
-	virtual int memp_stat(DB_MPOOL_STAT
-		      **gsp, DB_MPOOL_FSTAT ***fsp, u_int32_t flags);
-	virtual int memp_sync(DbLsn *lsn);
-	virtual int memp_trickle(int pct, int *nwrotep);
-
-	// Transaction functions
-	//
-	virtual int txn_begin(DbTxn *pid, DbTxn **tid, u_int32_t flags);
-	virtual int txn_checkpoint(u_int32_t kbyte, u_int32_t min, u_int32_t flags);
-	virtual int txn_recover(DbPreplist *preplist, long count,
-			long *retp, u_int32_t flags);
-	virtual int txn_stat(DB_TXN_STAT **statp, u_int32_t flags);
-
-	// Replication functions
-	//
-	virtual int rep_elect(int, int, u_int32_t, int *);
-	virtual int rep_process_message(Dbt *, Dbt *, int *);
-	virtual int rep_start(Dbt *, u_int32_t);
-	virtual int rep_stat(DB_REP_STAT **statp, u_int32_t flags);
-	virtual int set_rep_limit(u_int32_t, u_int32_t);
-	virtual int set_rep_transport(u_int32_t,
-	    int (*)(DbEnv *, const Dbt *, const Dbt *, int, u_int32_t));
-
-	// Conversion functions
-	//
-	virtual DB_ENV *get_DB_ENV()
-	{
-		return (DB_ENV *)imp();
-	}
-
-	virtual const DB_ENV *get_const_DB_ENV() const
-	{
-		return (const DB_ENV *)constimp();
-	}
-
-	static DbEnv* get_DbEnv(DB_ENV *dbenv)
-	{
-		return (DbEnv *)dbenv->api1_internal;
-	}
-
-	static const DbEnv* get_const_DbEnv(const DB_ENV *dbenv)
-	{
-		return (const DbEnv *)dbenv->api1_internal;
-	}
-
-	// For internal use only.
-	static DbEnv* wrap_DB_ENV(DB_ENV *dbenv);
-
-	// These are public only because they need to be called
-	// via C functions.  They should never be called by users
-	// of this class.
-	//
-	static void _stream_error_function(const char *, char *);
-	static int _app_dispatch_intercept(DB_ENV *env, DBT *dbt, DB_LSN *lsn,
-					db_recops op);
-	static void _paniccall_intercept(DB_ENV *env, int errval);
-	static void _feedback_intercept(DB_ENV *env, int opcode, int pct);
-	static int _rep_send_intercept(DB_ENV *env,
-				       const DBT *cntrl, const DBT *data,
-				       int id, u_int32_t flags);
-
-private:
-	void cleanup();
-	int initialize(DB_ENV *env);
-	int error_policy();
-
-	// For internal use only.
-	DbEnv(DB_ENV *, u_int32_t flags);
-
-	// no copying
-	DbEnv(const DbEnv &);
-	void operator = (const DbEnv &);
-
-	// instance data
-	int construct_error_;
-	u_int32_t construct_flags_;
-	int (*app_dispatch_callback_)(DbEnv *, Dbt *, DbLsn *, db_recops);
-	void (*feedback_callback_)(DbEnv *, int, int);
-	void (*paniccall_callback_)(DbEnv *, int);
-	int (*pgin_callback_)(DbEnv *dbenv, db_pgno_t pgno,
-			      void *pgaddr, Dbt *pgcookie);
-	int (*pgout_callback_)(DbEnv *dbenv, db_pgno_t pgno,
-			       void *pgaddr, Dbt *pgcookie);
-	int (*rep_send_callback_)(DbEnv *,
-	    const Dbt *, const Dbt *, int, u_int32_t);
-
-	// class data
-	static __DB_OSTREAMCLASS *error_stream_;
-};
-
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-//
-// Table access classes
-//
-
-//
-// Represents a database table = a set of keys with associated values.
-//
-class _exported Db
-{
-	friend class DbEnv;
-
-private:
-	// Put this first to allow inlining with some C++ compilers (g++-2.95)
-	DEFINE_DB_CLASS(Db);
-
-public:
-	Db(DbEnv*, u_int32_t);      // create a Db object, then call open()
-	virtual ~Db();              // does *not* call close.
-
-	// These methods exactly match those in the C interface.
-	//
-	virtual int associate(DbTxn *txn, Db *secondary,
-	    int (*callback)(Db *, const Dbt *, const Dbt *, Dbt *),
-	    u_int32_t flags);
-	virtual int close(u_int32_t flags);
-        virtual int cursor(DbTxn *txnid, Dbc **cursorp, u_int32_t flags);
-	virtual int del(DbTxn *txnid, Dbt *key, u_int32_t flags);
-	virtual void err(int, const char *, ...);
-	virtual void errx(const char *, ...);
-	virtual int fd(int *fdp);
-	virtual int get(DbTxn *txnid, Dbt *key, Dbt *data, u_int32_t flags);
-	virtual void *get_app_private() const;
-	virtual int get_byteswapped(int *);
-	virtual int get_type(DBTYPE *);
-	virtual int join(Dbc **curslist, Dbc **dbcp, u_int32_t flags);
-	virtual int key_range(DbTxn *, Dbt *, DB_KEY_RANGE *, u_int32_t);
-	virtual int open(DbTxn *txnid,
-	    const char *, const char *subname, DBTYPE, u_int32_t, int);
-	virtual int pget(DbTxn *txnid, Dbt *key, Dbt *pkey, Dbt *data,
-		 u_int32_t flags);
-	virtual int put(DbTxn *, Dbt *, Dbt *, u_int32_t);
-	virtual int remove(const char *, const char *, u_int32_t);
-	virtual int rename(const char *, const char *, const char *, u_int32_t);
-	virtual int set_alloc(db_malloc_fcn_type, db_realloc_fcn_type,
-		      db_free_fcn_type);
-	virtual void set_app_private(void *);
-	virtual int set_append_recno(int (*)(Db *, Dbt *, db_recno_t));
-	virtual int set_bt_compare(bt_compare_fcn_type); /*deprecated*/
-	virtual int set_bt_compare(int (*)(Db *, const Dbt *, const Dbt *));
-	virtual int set_bt_maxkey(u_int32_t);
-	virtual int set_bt_minkey(u_int32_t);
-	virtual int set_bt_prefix(bt_prefix_fcn_type); /*deprecated*/
-	virtual int set_bt_prefix(size_t (*)(Db *, const Dbt *, const Dbt *));
-	virtual int set_cachesize(u_int32_t, u_int32_t, int);
-	virtual int set_cache_priority(DB_CACHE_PRIORITY);
-	virtual int set_dup_compare(dup_compare_fcn_type); /*deprecated*/
-	virtual int set_dup_compare(int (*)(Db *, const Dbt *, const Dbt *));
-	virtual int set_encrypt(const char *, int);
-	virtual void set_errcall(void (*)(const char *, char *));
-	virtual void set_errfile(FILE *);
-	virtual void set_errpfx(const char *);
-	virtual int set_feedback(void (*)(Db *, int, int));
-	virtual int set_flags(u_int32_t);
-	virtual int set_h_ffactor(u_int32_t);
-	virtual int set_h_hash(h_hash_fcn_type); /*deprecated*/
-	virtual int set_h_hash(u_int32_t (*)(Db *, const void *, u_int32_t));
-	virtual int set_h_nelem(u_int32_t);
-	virtual int set_lorder(int);
-	virtual int set_pagesize(u_int32_t);
-	virtual int set_paniccall(void (*)(DbEnv *, int));
-	virtual int set_re_delim(int);
-	virtual int set_re_len(u_int32_t);
-	virtual int set_re_pad(int);
-	virtual int set_re_source(char *);
-	virtual int set_q_extentsize(u_int32_t);
-	virtual int stat(void *sp, u_int32_t flags);
-	virtual int sync(u_int32_t flags);
-	virtual int truncate(DbTxn *, u_int32_t *, u_int32_t);
-	virtual int upgrade(const char *name, u_int32_t flags);
-	virtual int verify(const char *, const char *, __DB_OSTREAMCLASS *, u_int32_t);
-
-	// These additional methods are not in the C interface, and
-	// are only available for C++.
-	//
-	virtual void set_error_stream(__DB_OSTREAMCLASS *);
-
-	virtual DB *get_DB()
-	{
-		return (DB *)imp();
-	}
-
-	virtual const DB *get_const_DB() const
-	{
-		return (const DB *)constimp();
-	}
-
-	static Db* get_Db(DB *db)
-	{
-		return (Db *)db->api_internal;
-	}
-
-	static const Db* get_const_Db(const DB *db)
-	{
-		return (const Db *)db->api_internal;
-	}
-
-private:
-	// no copying
-	Db(const Db &);
-	Db &operator = (const Db &);
-
-	void cleanup();
-	int initialize();
-	int error_policy();
-
-	// instance data
-	DbEnv *env_;
-	int construct_error_;
-	u_int32_t flags_;
-	u_int32_t construct_flags_;
-
-public:
-	// These are public only because they need to be called
-	// via C callback functions.  They should never be used by
-	// external users of this class.
-	//
-	int (*append_recno_callback_)(Db *, Dbt *, db_recno_t);
-	int (*associate_callback_)(Db *, const Dbt *, const Dbt *, Dbt *);
-	int (*bt_compare_callback_)(Db *, const Dbt *, const Dbt *);
-	size_t (*bt_prefix_callback_)(Db *, const Dbt *, const Dbt *);
-	int (*dup_compare_callback_)(Db *, const Dbt *, const Dbt *);
-	void (*feedback_callback_)(Db *, int, int);
-	u_int32_t (*h_hash_callback_)(Db *, const void *, u_int32_t);
-};
-
-//
-// A chunk of data, maybe a key or value.
-//
-class _exported Dbt : private DBT
-{
-	friend class Dbc;
-	friend class Db;
-	friend class DbEnv;
-	friend class DbLogc;
-
-public:
-
-	// key/data
-	void *get_data() const                 { return data; }
-	void set_data(void *value)             { data = value; }
-
-	// key/data length
-	u_int32_t get_size() const             { return size; }
-	void set_size(u_int32_t value)         { size = value; }
-
-	// RO: length of user buffer.
-	u_int32_t get_ulen() const             { return ulen; }
-	void set_ulen(u_int32_t value)         { ulen = value; }
-
-	// RO: get/put record length.
-	u_int32_t get_dlen() const             { return dlen; }
-	void set_dlen(u_int32_t value)         { dlen = value; }
-
-	// RO: get/put record offset.
-	u_int32_t get_doff() const             { return doff; }
-	void set_doff(u_int32_t value)         { doff = value; }
-
-	// flags
-	u_int32_t get_flags() const            { return flags; }
-	void set_flags(u_int32_t value)        { flags = value; }
-
-	// Conversion functions
-	DBT *get_DBT()                         { return (DBT *)this; }
-	const DBT *get_const_DBT() const       { return (const DBT *)this; }
-
-	static Dbt* get_Dbt(DBT *dbt)          { return (Dbt *)dbt; }
-	static const Dbt* get_const_Dbt(const DBT *dbt)
-					       { return (const Dbt *)dbt; }
-
-	Dbt(void *data, u_int32_t size);
-	Dbt();
-	~Dbt();
-	Dbt(const Dbt &);
-	Dbt &operator = (const Dbt &);
-
-private:
-	// Note: no extra data appears in this class (other than
-	// inherited from DBT) since we need DBT and Dbt objects
-	// to have interchangable pointers.
-	//
-	// When subclassing this class, remember that callback
-	// methods like bt_compare, bt_prefix, dup_compare may
-	// internally manufacture DBT objects (which later are
-	// cast to Dbt), so such callbacks might receive objects
-	// not of your subclassed type.
-};
-
-class _exported Dbc : protected DBC
-{
-	friend class Db;
-
-public:
-	int close();
-	int count(db_recno_t *countp, u_int32_t flags);
-	int del(u_int32_t flags);
-	int dup(Dbc** cursorp, u_int32_t flags);
-	int get(Dbt* key, Dbt *data, u_int32_t flags);
-	int pget(Dbt* key, Dbt* pkey, Dbt *data, u_int32_t flags);
-	int put(Dbt* key, Dbt *data, u_int32_t flags);
-
-private:
-	// No data is permitted in this class (see comment at top)
-
-	// Note: use Db::cursor() to get pointers to a Dbc,
-	// and call Dbc::close() rather than delete to release them.
-	//
-	Dbc();
-	~Dbc();
-
-	// no copying
-	Dbc(const Dbc &);
-	Dbc &operator = (const Dbc &);
-};
-
-class _exported DbLogc : protected DB_LOGC
-{
-	friend class DbEnv;
-
-public:
-	int close(u_int32_t _flags);
-	int get(DbLsn *lsn, Dbt *data, u_int32_t _flags);
-
-private:
-	// No data is permitted in this class (see comment at top)
-
-	// Note: use Db::cursor() to get pointers to a Dbc,
-	// and call Dbc::close() rather than delete to release them.
-	//
-	DbLogc();
-	~DbLogc();
-
-	// no copying
-	DbLogc(const Dbc &);
-	DbLogc &operator = (const Dbc &);
-};
-#endif /* !_DB_CXX_H_ */
diff --git a/bdb/dbinc/db_dispatch.h b/bdb/dbinc/db_dispatch.h
deleted file mode 100644
index 283eb1e95de..00000000000
--- a/bdb/dbinc/db_dispatch.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- */
-/*
- * Copyright (c) 1995, 1996
- *	The President and Fellows of Harvard University.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: db_dispatch.h,v 11.30 2002/06/20 19:34:03 margo Exp $
- */
-
-#ifndef _DB_DISPATCH_H_
-#define	_DB_DISPATCH_H_
-
-/*
- * Declarations and typedefs for the list of transaction IDs used during
- * recovery.  This is a generic list used to pass along whatever information
- * we need during recovery.
- */
-typedef enum {
-	TXNLIST_DELETE,
-	TXNLIST_LSN,
-	TXNLIST_PGNO,
-	TXNLIST_TXNID
-} db_txnlist_type;
-
-#define	DB_TXNLIST_MASK(hp, n)  (n % hp->nslots)
-struct __db_txnhead {
-	u_int32_t maxid;	/* Maximum transaction id. */
-	DB_LSN maxlsn;		/* Maximum commit lsn. */
-	DB_LSN ckplsn;		/* LSN of last retained checkpoint. */
-	DB_LSN trunc_lsn;	/* Lsn to which we are going to truncate;
-				 * make sure we abort anyone after this. */
-	int32_t generation;	/* Current generation number. */
-	int32_t gen_alloc;	/* Number of generations allocated. */
-	struct {
-		int32_t generation;
-		u_int32_t txn_min;
-		u_int32_t txn_max;
-	} *gen_array;		/* Array of txnids associted with a gen. */
-	int nslots;
-	LIST_HEAD(__db_headlink, __db_txnlist) head[1];
-};
-
-struct __db_txnlist {
-	db_txnlist_type type;
-	LIST_ENTRY(__db_txnlist) links;
-	union {
-		struct {
-			u_int32_t txnid;
-			int32_t	generation;
-			int32_t status;
-		} t;
-		struct {
-			int32_t ntxns;
-			int32_t maxn;
-			DB_LSN *lsn_array;
-		} l;
-		struct {
-			int32_t nentries;
-			int32_t maxentry;
-			int32_t locked;
-			char *fname;
-			int32_t fileid;
-			db_pgno_t *pgno_array;
-			u_int8_t uid[DB_FILE_ID_LEN];
-		} p;
-	} u;
-};
-
-/*
- * Flag value for __db_txnlist_lsnadd. Distinguish whether we are replacing
- * an entry in the transaction list or adding a new one.
- */
-#define	TXNLIST_NEW	0x1
-
-#define	DB_user_BEGIN		10000
-
-#endif /* !_DB_DISPATCH_H_ */
diff --git a/bdb/dbinc/db_int.in b/bdb/dbinc/db_int.in
deleted file mode 100644
index 2f46293a65d..00000000000
--- a/bdb/dbinc/db_int.in
+++ /dev/null
@@ -1,473 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: db_int.in,v 11.106 2002/09/10 02:48:08 bostic Exp $
- */
-
-#ifndef _DB_INTERNAL_H_
-#define	_DB_INTERNAL_H_
-
-/*******************************************************
- * System includes, db.h, a few general DB includes.  The DB includes are
- * here because it's OK if db_int.h includes queue structure declarations.
- *******************************************************/
-#ifndef NO_SYSTEM_INCLUDES
-#if defined(__STDC__) || defined(__cplusplus)
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include <errno.h>
-#endif
-
-#include "db.h"
-
-#include "dbinc/queue.h"
-#include "dbinc/shqueue.h"
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*******************************************************
- * General purpose constants and macros.
- *******************************************************/
-#define	UINT16_T_MAX	    0xffff	/* Maximum 16 bit unsigned. */
-#define	UINT32_T_MAX	0xffffffff	/* Maximum 32 bit unsigned. */
-
-#define	MEGABYTE	1048576
-#define	GIGABYTE	1073741824
-
-#define	MS_PER_SEC	1000		/* Milliseconds in a second. */
-#define	USEC_PER_MS	1000		/* Microseconds in a millisecond. */
-
-#define	RECNO_OOB	0		/* Illegal record number. */
-
-/* Test for a power-of-two (tests true for zero, which doesn't matter here). */
-#define	POWER_OF_TWO(x)	(((x) & ((x) - 1)) == 0)
-
-/* Test for valid page sizes. */
-#define	DB_MIN_PGSIZE	0x000200	/* Minimum page size (512). */
-#define	DB_MAX_PGSIZE	0x010000	/* Maximum page size (65536). */
-#define	IS_VALID_PAGESIZE(x)						\
-	(POWER_OF_TWO(x) && (x) >= DB_MIN_PGSIZE && ((x) <= DB_MAX_PGSIZE))
-
-/* Minimum number of pages cached, by default. */
-#define	DB_MINPAGECACHE	16
-
-/*
- * If we are unable to determine the underlying filesystem block size, use
- * 8K on the grounds that most OS's use less than 8K for a VM page size.
- */
-#define	DB_DEF_IOSIZE	(8 * 1024)
-
-/*
- * Aligning items to particular sizes or in pages or memory.
- *
- * db_align_t --
- * Largest integral type, used to align structures in memory.  We don't store
- * floating point types in structures, so integral types should be sufficient
- * (and we don't have to worry about systems that store floats in other than
- * power-of-2 numbers of bytes).  Additionally this fixes compiler that rewrite
- * structure assignments and ANSI C memcpy calls to be in-line instructions
- * that happen to require alignment.  Note: this alignment isn't sufficient for
- * mutexes, which depend on things like cache line alignment.  Mutex alignment
- * is handled separately, in mutex.h.
- *
- * db_alignp_t --
- * Integral type that's the same size as a pointer.  There are places where
- * DB modifies pointers by discarding the bottom bits to guarantee alignment.
- * We can't use db_align_t, it may be larger than the pointer, and compilers
- * get upset about that.  So far we haven't run on any machine where there
- * isn't an integral type the same size as a pointer -- here's hoping.
- */
-@db_align_t_decl@
-@db_alignp_t_decl@
-
-/* Align an integer to a specific boundary. */
-#undef	ALIGN
-#define	ALIGN(v, bound)	(((v) + (bound) - 1) & ~(((db_align_t)bound) - 1))
-
-/*
- * Print an address as a u_long (a u_long is the largest type we can print
- * portably).  Most 64-bit systems have made longs 64-bits, so this should
- * work.
- */
-#define	P_TO_ULONG(p)	((u_long)(db_alignp_t)(p))
-
-/*
- * Convert a pointer to a small integral value.
- *
- * The (u_int16_t)(db_alignp_t) cast avoids warnings: the (db_alignp_t) cast
- * converts the value to an integral type, and the (u_int16_t) cast converts
- * it to a small integral type so we don't get complaints when we assign the
- * final result to an integral type smaller than db_alignp_t.
- */
-#define	P_TO_UINT32(p)	((u_int32_t)(db_alignp_t)(p))
-#define	P_TO_UINT16(p)	((u_int16_t)(db_alignp_t)(p))
-
-/*
- * There are several on-page structures that are declared to have a number of
- * fields followed by a variable length array of items.  The structure size
- * without including the variable length array or the address of the first of
- * those elements can be found using SSZ.
- *
- * This macro can also be used to find the offset of a structure element in a
- * structure.  This is used in various places to copy structure elements from
- * unaligned memory references, e.g., pointers into a packed page.
- *
- * There are two versions because compilers object if you take the address of
- * an array.
- */
-#undef	SSZ
-#define	SSZ(name, field)  P_TO_UINT16(&(((name *)0)->field))
-
-#undef	SSZA
-#define	SSZA(name, field) P_TO_UINT16(&(((name *)0)->field[0]))
-
-/* Structure used to print flag values. */
-typedef struct __fn {
-	u_int32_t mask;			/* Flag value. */
-	const char *name;		/* Flag name. */
-} FN;
-
-/* Set, clear and test flags. */
-#define	FLD_CLR(fld, f)		(fld) &= ~(f)
-#define	FLD_ISSET(fld, f)	((fld) & (f))
-#define	FLD_SET(fld, f)		(fld) |= (f)
-#define	F_CLR(p, f)		(p)->flags &= ~(f)
-#define	F_ISSET(p, f)		((p)->flags & (f))
-#define	F_SET(p, f)		(p)->flags |= (f)
-#define	LF_CLR(f)		((flags) &= ~(f))
-#define	LF_ISSET(f)		((flags) & (f))
-#define	LF_SET(f)		((flags) |= (f))
-
-/* Display separator string. */
-#undef	DB_LINE
-#define	DB_LINE "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
-
-/* Unused, or not-used-yet variable.  "Shut that bloody compiler up!" */
-#define	COMPQUIET(n, v)	(n) = (v)
-
-/*******************************************************
- * API return values
- *******************************************************/
- /*
-  * Return values that are OK for each different call.  Most calls have
-  * a standard 'return of 0 is only OK value', but some, like db->get
-  * have DB_NOTFOUND as a return value, but it really isn't an error.
-  */
-#define	DB_RETOK_STD(ret)	((ret) == 0)
-#define	DB_RETOK_DBCDEL(ret)	((ret) == 0 || (ret) == DB_KEYEMPTY || \
-				    (ret) == DB_NOTFOUND)
-#define	DB_RETOK_DBCGET(ret)	DB_RETOK_DBGET(ret)
-#define	DB_RETOK_DBCPUT(ret)	((ret) == 0 || (ret) == DB_KEYEXIST || \
-				    (ret) == DB_NOTFOUND)
-#define	DB_RETOK_DBDEL(ret)	((ret) == 0 || (ret) == DB_NOTFOUND)
-#define	DB_RETOK_DBGET(ret)	((ret) == 0 || (ret) == DB_KEYEMPTY || \
-				    (ret) == DB_NOTFOUND)
-#define	DB_RETOK_DBPUT(ret)	((ret) == 0 || (ret) == DB_KEYEXIST)
-#define	DB_RETOK_LGGET(ret)	((ret) == 0 || (ret) == DB_NOTFOUND)
-#define	DB_RETOK_MPGET(ret)	((ret) == 0 || (ret) == DB_PAGE_NOTFOUND)
-#define	DB_RETOK_REPPMSG(ret)	((ret) == 0 || (ret) == DB_REP_NEWMASTER || \
-				    (ret) == DB_REP_NEWSITE)
-
-/*******************************************************
- * Files.
- *******************************************************/
- /*
-  * We use 1024 as the maximum path length.  It's too hard to figure out what
-  * the real path length is, as it was traditionally stored in <sys/param.h>,
-  * and that file isn't always available.
-  */
-#undef	MAXPATHLEN
-#define	MAXPATHLEN	1024
-
-#define	PATH_DOT	"."	/* Current working directory. */
-#define	PATH_SEPARATOR	"/"	/* Path separator character(s). */
-
-/*
- * Flags understood by __os_open.
- */
-#define	DB_OSO_CREATE	0x0001		/* POSIX: O_CREAT */
-#define	DB_OSO_DIRECT	0x0002		/* Don't buffer the file in the OS. */
-#define	DB_OSO_EXCL	0x0004		/* POSIX: O_EXCL */
-#define	DB_OSO_LOG	0x0008		/* Opening a log file. */
-#define	DB_OSO_RDONLY	0x0010		/* POSIX: O_RDONLY */
-#define	DB_OSO_REGION	0x0020		/* Opening a region file. */
-#define	DB_OSO_SEQ	0x0040		/* Expected sequential access. */
-#define	DB_OSO_TEMP	0x0080		/* Remove after last close. */
-#define	DB_OSO_TRUNC	0x0100		/* POSIX: O_TRUNC */
-
-/*
- * Seek options understood by __os_seek.
- */
-typedef enum {
-	DB_OS_SEEK_CUR,			/* POSIX: SEEK_CUR */
-	DB_OS_SEEK_END,			/* POSIX: SEEK_END */
-	DB_OS_SEEK_SET			/* POSIX: SEEK_SET */
-} DB_OS_SEEK;
-
-/*******************************************************
- * Environment.
- *******************************************************/
-/* Type passed to __db_appname(). */
-typedef enum {
-	DB_APP_NONE=0,			/* No type (region). */
-	DB_APP_DATA,			/* Data file. */
-	DB_APP_LOG,			/* Log file. */
-	DB_APP_TMP			/* Temporary file. */
-} APPNAME;
-
-/*
- * CDB_LOCKING	CDB product locking.
- * CRYPTO_ON	Security has been configured.
- * LOCKING_ON	Locking has been configured.
- * LOGGING_ON	Logging has been configured.
- * MPOOL_ON	Memory pool has been configured.
- * RPC_ON	RPC has been configured.
- * TXN_ON	Transactions have been configured.
- */
-#define	CDB_LOCKING(dbenv)	F_ISSET(dbenv, DB_ENV_CDB)
-#define	CRYPTO_ON(dbenv)	((dbenv)->crypto_handle != NULL)
-#define	LOCKING_ON(dbenv)	((dbenv)->lk_handle != NULL)
-#define	LOGGING_ON(dbenv)	((dbenv)->lg_handle != NULL)
-#define	MPOOL_ON(dbenv)		((dbenv)->mp_handle != NULL)
-#define	RPC_ON(dbenv)		((dbenv)->cl_handle != NULL)
-#define	TXN_ON(dbenv)		((dbenv)->tx_handle != NULL)
-
-/*
- * STD_LOCKING	Standard locking, that is, locking was configured and CDB
- *		was not.  We do not do locking in off-page duplicate trees,
- *		so we check for that in the cursor first.
- */
-#define	STD_LOCKING(dbc)						\
-	(!F_ISSET(dbc, DBC_OPD) &&					\
-	    !CDB_LOCKING((dbc)->dbp->dbenv) && LOCKING_ON((dbc)->dbp->dbenv))
-
-/*
- * IS_RECOVERING: The system is running recovery.
- */
-#define	IS_RECOVERING(dbenv)						\
-	(LOGGING_ON(dbenv) &&						\
-	    F_ISSET((DB_LOG *)(dbenv)->lg_handle, DBLOG_RECOVER))
-
-/* Initialization methods are often illegal before/after open is called. */
-#define	ENV_ILLEGAL_AFTER_OPEN(dbenv, name)				\
-	if (F_ISSET((dbenv), DB_ENV_OPEN_CALLED))			\
-		return (__db_mi_open(dbenv, name, 1));
-#define	ENV_ILLEGAL_BEFORE_OPEN(dbenv, name)				\
-	if (!F_ISSET((dbenv), DB_ENV_OPEN_CALLED))			\
-		return (__db_mi_open(dbenv, name, 0));
-
-/* We're not actually user hostile, honest. */
-#define	ENV_REQUIRES_CONFIG(dbenv, handle, i, flags)			\
-	if (handle == NULL)						\
-		return (__db_env_config(dbenv, i, flags));
-
-/*******************************************************
- * Database Access Methods.
- *******************************************************/
-/*
- * DB_IS_THREADED --
- *	The database handle is free-threaded (was opened with DB_THREAD).
- */
-#define	DB_IS_THREADED(dbp)						\
-	((dbp)->mutexp != NULL)
-
-/* Initialization methods are often illegal before/after open is called. */
-#define	DB_ILLEGAL_AFTER_OPEN(dbp, name)				\
-	if (F_ISSET((dbp), DB_AM_OPEN_CALLED))				\
-		return (__db_mi_open((dbp)->dbenv, name, 1));
-#define	DB_ILLEGAL_BEFORE_OPEN(dbp, name)				\
-	if (!F_ISSET((dbp), DB_AM_OPEN_CALLED))				\
-		return (__db_mi_open((dbp)->dbenv, name, 0));
-/* Some initialization methods are illegal if environment isn't local. */
-#define	DB_ILLEGAL_IN_ENV(dbp, name)					\
-	if (!F_ISSET((dbp)->dbenv, DB_ENV_DBLOCAL))			\
-		return (__db_mi_env((dbp)->dbenv, name));
-#define	DB_ILLEGAL_METHOD(dbp, flags) {					\
-	int __ret;							\
-	if ((__ret = __dbh_am_chk(dbp, flags)) != 0)			\
-		return (__ret);						\
-}
-
-/*
- * Common DBC->internal fields.  Each access method adds additional fields
- * to this list, but the initial fields are common.
- */
-#define	__DBC_INTERNAL							\
-	DBC	 *opd;			/* Off-page duplicate cursor. */\
-									\
-	void	 *page;			/* Referenced page. */		\
-	db_pgno_t root;			/* Tree root. */		\
-	db_pgno_t pgno;			/* Referenced page number. */	\
-	db_indx_t indx;			/* Referenced key item index. */\
-									\
-	DB_LOCK		lock;		/* Cursor lock. */		\
-	db_lockmode_t	lock_mode;	/* Lock mode. */
-
-struct __dbc_internal {
-	__DBC_INTERNAL
-};
-
-/* Actions that __db_master_update can take. */
-typedef enum { MU_REMOVE, MU_RENAME, MU_OPEN } mu_action;
-
-/*
- * Access-method-common macro for determining whether a cursor
- * has been initialized.
- */
-#define	IS_INITIALIZED(dbc)	((dbc)->internal->pgno != PGNO_INVALID)
-
-/* Free the callback-allocated buffer, if necessary, hanging off of a DBT. */
-#define	FREE_IF_NEEDED(sdbp, dbt)					\
-	if (F_ISSET((dbt), DB_DBT_APPMALLOC)) {				\
-		__os_ufree((sdbp)->dbenv, (dbt)->data);			\
-		F_CLR((dbt), DB_DBT_APPMALLOC);				\
-	}
-
-/*
- * Use memory belonging to object "owner" to return the results of
- * any no-DBT-flag get ops on cursor "dbc".
- */
-#define	SET_RET_MEM(dbc, owner)				\
-	do {						\
-		(dbc)->rskey = &(owner)->my_rskey;	\
-		(dbc)->rkey = &(owner)->my_rkey;	\
-		(dbc)->rdata = &(owner)->my_rdata;	\
-	} while (0)
-
-/* Use the return-data memory src is currently set to use in dest as well. */
-#define	COPY_RET_MEM(src, dest)				\
-	do {						\
-		(dest)->rskey = (src)->rskey;		\
-		(dest)->rkey = (src)->rkey;		\
-		(dest)->rdata = (src)->rdata;		\
-	} while (0)
-
-/* Reset the returned-memory pointers to their defaults. */
-#define	RESET_RET_MEM(dbc)				\
-	do {						\
-		(dbc)->rskey = &(dbc)->my_rskey;	\
-		(dbc)->rkey = &(dbc)->my_rkey;		\
-		(dbc)->rdata = &(dbc)->my_rdata;	\
-	} while (0)
-
-/*******************************************************
- * Mpool.
- *******************************************************/
-/*
- * File types for DB access methods.  Negative numbers are reserved to DB.
- */
-#define	DB_FTYPE_SET		-1	/* Call pgin/pgout functions. */
-#define	DB_FTYPE_NOTSET		 0	/* Don't call... */
-
-/* Structure used as the DB pgin/pgout pgcookie. */
-typedef struct __dbpginfo {
-	size_t	db_pagesize;		/* Underlying page size. */
-	u_int32_t flags;		/* Some DB_AM flags needed. */
-	DBTYPE  type;			/* DB type */
-} DB_PGINFO;
-
-/*******************************************************
- * Log.
- *******************************************************/
-/* Initialize an LSN to 'zero'. */
-#define	ZERO_LSN(LSN) do {						\
-	(LSN).file = 0;							\
-	(LSN).offset = 0;						\
-} while (0)
-#define	IS_ZERO_LSN(LSN)	((LSN).file == 0)
-
-#define	IS_INIT_LSN(LSN)	((LSN).file == 1 && (LSN).offset == 0)
-#define	INIT_LSN(LSN)		do {					\
-	(LSN).file = 1;							\
-	(LSN).offset = 0;						\
-} while (0)
-
-#define	MAX_LSN(LSN) do {						\
-	(LSN).file = UINT32_T_MAX;					\
-	(LSN).offset = UINT32_T_MAX;					\
-} while (0)
-#define	IS_MAX_LSN(LSN) \
-	((LSN).file == UINT32_T_MAX && (LSN).offset == UINT32_T_MAX)
-
-/* If logging is turned off, smash the lsn. */
-#define	LSN_NOT_LOGGED(LSN) do {					\
-	(LSN).file = 0;							\
-	(LSN).offset = 1;						\
-} while (0)
-#define	IS_NOT_LOGGED_LSN(LSN) \
-	((LSN).file == 0 && (LSN).offset == 1)
-
-/*
- * Test if the environment is currently logging changes.  If we're in
- * recovery or we're a replication client, we don't need to log changes
- * because they're already in the log, even though we have a fully functional
- * log system.
- */
-#define	DBENV_LOGGING(dbenv)						\
-	(LOGGING_ON(dbenv) && !F_ISSET((dbenv), DB_ENV_REP_CLIENT) &&	\
-	    (!IS_RECOVERING(dbenv)))
-
-/*
- * Test if we need to log a change.  Note that the DBC_RECOVER flag is set
- * when we're in abort, as well as during recovery;  thus DBC_LOGGING may be
- * false for a particular dbc even when DBENV_LOGGING is true.
- *
- * We explicitly use LOGGING_ON/DB_ENV_REP_CLIENT here because we don't
- * want to have to pull in the log headers, which IS_RECOVERING (and thus
- * DBENV_LOGGING) rely on, and because DBC_RECOVER should be set anytime
- * IS_RECOVERING would be true.
- */
-#define	DBC_LOGGING(dbc)						\
-	(LOGGING_ON((dbc)->dbp->dbenv) && !F_ISSET((dbc), DBC_RECOVER) && \
-	 !F_ISSET((dbc)->dbp->dbenv, DB_ENV_REP_CLIENT))
-
-/*******************************************************
- * Txn.
- *******************************************************/
-#define	DB_NONBLOCK(C)	((C)->txn != NULL && F_ISSET((C)->txn, TXN_NOWAIT))
-#define	IS_SUBTRANSACTION(txn)						\
-	((txn) != NULL && (txn)->parent != NULL)
-
-/*******************************************************
- * Crypto.
- *******************************************************/
-#define	DB_IV_BYTES     16		/* Bytes per IV */
-#define	DB_MAC_KEY	20		/* Bytes per MAC checksum */
-
-/*******************************************************
- * Forward structure declarations.
- *******************************************************/
-struct __db_reginfo_t;	typedef struct __db_reginfo_t REGINFO;
-struct __db_txnhead;	typedef struct __db_txnhead DB_TXNHEAD;
-struct __db_txnlist;	typedef struct __db_txnlist DB_TXNLIST;
-struct __vrfy_childinfo; typedef struct __vrfy_childinfo VRFY_CHILDINFO;
-struct __vrfy_dbinfo;   typedef struct __vrfy_dbinfo VRFY_DBINFO;
-struct __vrfy_pageinfo; typedef struct __vrfy_pageinfo VRFY_PAGEINFO;
-
-#if defined(__cplusplus)
-}
-#endif
-
-/*******************************************************
- * Remaining general DB includes.
- *******************************************************/
-@db_int_def@
-
-#include "dbinc/globals.h"
-#include "dbinc/debug.h"
-#include "dbinc/mutex.h"
-#include "dbinc/region.h"
-#include "dbinc_auto/mutex_ext.h"	/* XXX: Include after region.h. */
-#include "dbinc_auto/env_ext.h"
-#include "dbinc/os.h"
-#include "dbinc_auto/clib_ext.h"
-#include "dbinc_auto/common_ext.h"
-
-#endif /* !_DB_INTERNAL_H_ */
diff --git a/bdb/dbinc/db_join.h b/bdb/dbinc/db_join.h
deleted file mode 100644
index 487ce3eebbb..00000000000
--- a/bdb/dbinc/db_join.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1998-2002
- *	Sleepycat Software.  All rights reserved.
- *
- *	@(#)db_join.h	11.1 (Sleepycat) 7/25/99
- */
-
-#ifndef _DB_JOIN_H_
-#define	_DB_JOIN_H_
-
-/*
- * Joins use a join cursor that is similar to a regular DB cursor except
- * that it only supports c_get and c_close functionality.  Also, it does
- * not support the full range of flags for get.
- */
-typedef struct __join_cursor {
-	u_int8_t *j_exhausted;	/* Array of flags; is cursor i exhausted? */
-	DBC	**j_curslist;	/* Array of cursors in the join: constant. */
-	DBC	**j_fdupcurs;	/* Cursors w/ first intances of current dup. */
-	DBC	**j_workcurs;	/* Scratch cursor copies to muck with. */
-	DB	 *j_primary;	/* Primary dbp. */
-	DBT	  j_key;	/* Used to do lookups. */
-	DBT	  j_rdata;	/* Memory used for data return. */
-	u_int32_t j_ncurs;	/* How many cursors do we have? */
-#define	JOIN_RETRY	0x01	/* Error on primary get; re-return same key. */
-	u_int32_t flags;
-} JOIN_CURSOR;
-
-#endif /* !_DB_JOIN_H_ */
diff --git a/bdb/dbinc/db_page.h b/bdb/dbinc/db_page.h
deleted file mode 100644
index 97497556fd9..00000000000
--- a/bdb/dbinc/db_page.h
+++ /dev/null
@@ -1,651 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: db_page.h,v 11.52 2002/09/13 21:24:04 bostic Exp $
- */
-
-#ifndef _DB_PAGE_H_
-#define	_DB_PAGE_H_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- * DB page formats.
- *
- * !!!
- * This implementation requires that values within the following structures
- * NOT be padded -- note, ANSI C permits random padding within structures.
- * If your compiler pads randomly you can just forget ever making DB run on
- * your system.  In addition, no data type can require larger alignment than
- * its own size, e.g., a 4-byte data element may not require 8-byte alignment.
- *
- * Note that key/data lengths are often stored in db_indx_t's -- this is
- * not accidental, nor does it limit the key/data size.  If the key/data
- * item fits on a page, it's guaranteed to be small enough to fit into a
- * db_indx_t, and storing it in one saves space.
- */
-
-#define	PGNO_INVALID	0	/* Invalid page number in any database. */
-#define	PGNO_BASE_MD	0	/* Base database: metadata page number. */
-
-/* Page types. */
-#define	P_INVALID	0	/* Invalid page type. */
-#define	__P_DUPLICATE	1	/* Duplicate. DEPRECATED in 3.1 */
-#define	P_HASH		2	/* Hash. */
-#define	P_IBTREE	3	/* Btree internal. */
-#define	P_IRECNO	4	/* Recno internal. */
-#define	P_LBTREE	5	/* Btree leaf. */
-#define	P_LRECNO	6	/* Recno leaf. */
-#define	P_OVERFLOW	7	/* Overflow. */
-#define	P_HASHMETA	8	/* Hash metadata page. */
-#define	P_BTREEMETA	9	/* Btree metadata page. */
-#define	P_QAMMETA	10	/* Queue metadata page. */
-#define	P_QAMDATA	11	/* Queue data page. */
-#define	P_LDUP		12	/* Off-page duplicate leaf. */
-#define	P_PAGETYPE_MAX	13
-
-/*
- * When we create pages in mpool, we ask mpool to clear some number of bytes
- * in the header.  This number must be at least as big as the regular page
- * headers and cover enough of the btree and hash meta-data pages to obliterate
- * the page type.
- */
-#define	DB_PAGE_DB_LEN		32
-#define	DB_PAGE_QUEUE_LEN	0
-
-/************************************************************************
- GENERIC METADATA PAGE HEADER
- *
- * !!!
- * The magic and version numbers have to be in the same place in all versions
- * of the metadata page as the application may not have upgraded the database.
- ************************************************************************/
-typedef struct _dbmeta33 {
-	DB_LSN	  lsn;		/* 00-07: LSN. */
-	db_pgno_t pgno;		/* 08-11: Current page number. */
-	u_int32_t magic;	/* 12-15: Magic number. */
-	u_int32_t version;	/* 16-19: Version. */
-	u_int32_t pagesize;	/* 20-23: Pagesize. */
-	u_int8_t  encrypt_alg;	/*    24: Encryption algorithm. */
-	u_int8_t  type;		/*    25: Page type. */
-#define	DBMETA_CHKSUM		0x01
-	u_int8_t  metaflags;	/* 26: Meta-only flags */
-	u_int8_t  unused1;	/* 27: Unused. */
-	u_int32_t free;		/* 28-31: Free list page number. */
-	db_pgno_t last_pgno;	/* 32-35: Page number of last page in db. */
-	u_int32_t unused3;	/* 36-39: Unused. */
-	u_int32_t key_count;	/* 40-43: Cached key count. */
-	u_int32_t record_count;	/* 44-47: Cached record count. */
-	u_int32_t flags;	/* 48-51: Flags: unique to each AM. */
-				/* 52-71: Unique file ID. */
-	u_int8_t  uid[DB_FILE_ID_LEN];
-} DBMETA33, DBMETA;
-
-/************************************************************************
- BTREE METADATA PAGE LAYOUT
- ************************************************************************/
-typedef struct _btmeta33 {
-#define	BTM_DUP		0x001	/*	  Duplicates. */
-#define	BTM_RECNO	0x002	/*	  Recno tree. */
-#define	BTM_RECNUM	0x004	/*	  Btree: maintain record count. */
-#define	BTM_FIXEDLEN	0x008	/*	  Recno: fixed length records. */
-#define	BTM_RENUMBER	0x010	/*	  Recno: renumber on insert/delete. */
-#define	BTM_SUBDB	0x020	/*	  Subdatabases. */
-#define	BTM_DUPSORT	0x040	/*	  Duplicates are sorted. */
-#define	BTM_MASK	0x07f
-	DBMETA	dbmeta;		/* 00-71: Generic meta-data header. */
-
-	u_int32_t maxkey;	/* 72-75: Btree: Maxkey. */
-	u_int32_t minkey;	/* 76-79: Btree: Minkey. */
-	u_int32_t re_len;	/* 80-83: Recno: fixed-length record length. */
-	u_int32_t re_pad;	/* 84-87: Recno: fixed-length record pad. */
-	u_int32_t root;		/* 88-91: Root page. */
-	u_int32_t unused[92];	/* 92-459: Unused space */
-	u_int32_t crypto_magic;		/* 460-463: Crypto magic number */
-	u_int32_t trash[3];		/* 464-475: Trash space - Do not use */
-	u_int8_t iv[DB_IV_BYTES];	/* 476-495: Crypto IV */
-	u_int8_t chksum[DB_MAC_KEY];	/* 496-511: Page chksum */
-
-	/*
-	 * Minimum page size is 512.
-	 */
-} BTMETA33, BTMETA;
-
-/************************************************************************
- HASH METADATA PAGE LAYOUT
- ************************************************************************/
-typedef struct _hashmeta33 {
-#define	DB_HASH_DUP	0x01	/*	  Duplicates. */
-#define	DB_HASH_SUBDB	0x02	/*	  Subdatabases. */
-#define	DB_HASH_DUPSORT	0x04	/*	  Duplicates are sorted. */
-	DBMETA dbmeta;		/* 00-71: Generic meta-data page header. */
-
-	u_int32_t max_bucket;	/* 72-75: ID of Maximum bucket in use */
-	u_int32_t high_mask;	/* 76-79: Modulo mask into table */
-	u_int32_t low_mask;	/* 80-83: Modulo mask into table lower half */
-	u_int32_t ffactor;	/* 84-87: Fill factor */
-	u_int32_t nelem;	/* 88-91: Number of keys in hash table */
-	u_int32_t h_charkey;	/* 92-95: Value of hash(CHARKEY) */
-#define	NCACHED	32		/* number of spare points */
-				/* 96-223: Spare pages for overflow */
-	u_int32_t spares[NCACHED];
-	u_int32_t unused[59];	/* 224-459: Unused space */
-	u_int32_t crypto_magic;	/* 460-463: Crypto magic number */
-	u_int32_t trash[3];	/* 464-475: Trash space - Do not use */
-	u_int8_t iv[DB_IV_BYTES];	/* 476-495: Crypto IV */
-	u_int8_t chksum[DB_MAC_KEY];	/* 496-511: Page chksum */
-
-	/*
-	 * Minimum page size is 512.
-	 */
-} HMETA33, HMETA;
-
-/************************************************************************
- QUEUE METADATA PAGE LAYOUT
- ************************************************************************/
-/*
- * QAM Meta data page structure
- *
- */
-typedef struct _qmeta33 {
-	DBMETA    dbmeta;	/* 00-71: Generic meta-data header. */
-
-	u_int32_t first_recno;	/* 72-75: First not deleted record. */
-	u_int32_t cur_recno;	/* 76-79: Next recno to be allocated. */
-	u_int32_t re_len;	/* 80-83: Fixed-length record length. */
-	u_int32_t re_pad;	/* 84-87: Fixed-length record pad. */
-	u_int32_t rec_page;	/* 88-91: Records Per Page. */
-	u_int32_t page_ext;	/* 92-95: Pages per extent */
-
-	u_int32_t unused[91];	/* 96-459: Unused space */
-	u_int32_t crypto_magic;	/* 460-463: Crypto magic number */
-	u_int32_t trash[3];	/* 464-475: Trash space - Do not use */
-	u_int8_t iv[DB_IV_BYTES];	/* 476-495: Crypto IV */
-	u_int8_t chksum[DB_MAC_KEY];	/* 496-511: Page chksum */
-	/*
-	 * Minimum page size is 512.
-	 */
-} QMETA33, QMETA;
-
-/*
- * DBMETASIZE is a constant used by __db_file_setup and DB->verify
- * as a buffer which is guaranteed to be larger than any possible
- * metadata page size and smaller than any disk sector.
- */
-#define	DBMETASIZE	512
-
-/************************************************************************
- BTREE/HASH MAIN PAGE LAYOUT
- ************************************************************************/
-/*
- *	+-----------------------------------+
- *	|    lsn    |   pgno    | prev pgno |
- *	+-----------------------------------+
- *	| next pgno |  entries  | hf offset |
- *	+-----------------------------------+
- *	|   level   |   type    |   chksum  |
- *	+-----------------------------------+
- *	|    iv     |   index   | free -->  |
- *	+-----------+-----------------------+
- *	|	 F R E E A R E A            |
- *	+-----------------------------------+
- *	|              <-- free |   item    |
- *	+-----------------------------------+
- *	|   item    |   item    |   item    |
- *	+-----------------------------------+
- *
- * sizeof(PAGE) == 26 bytes + possibly 20 bytes of checksum and possibly
- * 16 bytes of IV (+ 2 bytes for alignment), and the following indices
- * are guaranteed to be two-byte aligned.  If we aren't doing crypto or
- * checksumming the bytes are reclaimed for data storage.
- *
- * For hash and btree leaf pages, index items are paired, e.g., inp[0] is the
- * key for inp[1]'s data.  All other types of pages only contain single items.
- */
-typedef struct __pg_chksum {
-	u_int8_t	unused[2];		/* 26-27: For alignment */
-	u_int8_t	chksum[4];		/* 28-31: Checksum */
-} PG_CHKSUM;
-
-typedef struct __pg_crypto {
-	u_int8_t	unused[2];		/* 26-27: For alignment */
-	u_int8_t	chksum[DB_MAC_KEY];	/* 28-47: Checksum */
-	u_int8_t	iv[DB_IV_BYTES];	/* 48-63: IV */
-	/* !!!
-	 * Must be 16-byte aligned for crypto
-	 */
-} PG_CRYPTO;
-
-typedef struct _db_page {
-	DB_LSN	  lsn;		/* 00-07: Log sequence number. */
-	db_pgno_t pgno;		/* 08-11: Current page number. */
-	db_pgno_t prev_pgno;	/* 12-15: Previous page number. */
-	db_pgno_t next_pgno;	/* 16-19: Next page number. */
-	db_indx_t entries;	/* 20-21: Number of items on the page. */
-	db_indx_t hf_offset;	/* 22-23: High free byte page offset. */
-
-	/*
-	 * The btree levels are numbered from the leaf to the root, starting
-	 * with 1, so the leaf is level 1, its parent is level 2, and so on.
-	 * We maintain this level on all btree pages, but the only place that
-	 * we actually need it is on the root page.  It would not be difficult
-	 * to hide the byte on the root page once it becomes an internal page,
-	 * so we could get this byte back if we needed it for something else.
-	 */
-#define	LEAFLEVEL	  1
-#define	MAXBTREELEVEL	255
-	u_int8_t  level;	/*    24: Btree tree level. */
-	u_int8_t  type;		/*    25: Page type. */
-} PAGE;
-
-#define	SIZEOF_PAGE	26
-/*
- * !!!
- * DB_AM_ENCRYPT always implies DB_AM_CHKSUM so that must come first.
- */
-#define	P_INP(dbp, pg)							\
-	((db_indx_t *)((u_int8_t *)(pg) + SIZEOF_PAGE +			\
-	(F_ISSET((dbp), DB_AM_ENCRYPT) ? sizeof(PG_CRYPTO) :		\
-	(F_ISSET((dbp), DB_AM_CHKSUM) ? sizeof(PG_CHKSUM) : 0))))
-
-#define	P_IV(dbp, pg)							\
-	(F_ISSET((dbp), DB_AM_ENCRYPT) ? ((u_int8_t *)(pg) +		\
-	SIZEOF_PAGE + SSZA(PG_CRYPTO, iv))				\
-	: NULL)
-
-#define	P_CHKSUM(dbp, pg)						\
-	(F_ISSET((dbp), DB_AM_ENCRYPT) ? ((u_int8_t *)(pg) +		\
-	SIZEOF_PAGE + SSZA(PG_CRYPTO, chksum)) :			\
-	(F_ISSET((dbp), DB_AM_CHKSUM) ? ((u_int8_t *)(pg) +		\
-	SIZEOF_PAGE + SSZA(PG_CHKSUM, chksum))			\
-	: NULL))
-
-/* PAGE element macros. */
-#define	LSN(p)		(((PAGE *)p)->lsn)
-#define	PGNO(p)		(((PAGE *)p)->pgno)
-#define	PREV_PGNO(p)	(((PAGE *)p)->prev_pgno)
-#define	NEXT_PGNO(p)	(((PAGE *)p)->next_pgno)
-#define	NUM_ENT(p)	(((PAGE *)p)->entries)
-#define	HOFFSET(p)	(((PAGE *)p)->hf_offset)
-#define	LEVEL(p)	(((PAGE *)p)->level)
-#define	TYPE(p)		(((PAGE *)p)->type)
-
-/************************************************************************
- QUEUE MAIN PAGE LAYOUT
- ************************************************************************/
-/*
- * Sizes of page below.  Used to reclaim space if not doing
- * crypto or checksumming.  If you change the QPAGE below you
- * MUST adjust this too.
- */
-#define	QPAGE_NORMAL	28
-#define	QPAGE_CHKSUM	48
-#define	QPAGE_SEC	64
-
-typedef struct _qpage {
-	DB_LSN	  lsn;		/* 00-07: Log sequence number. */
-	db_pgno_t pgno;		/* 08-11: Current page number. */
-	u_int32_t unused0[3];	/* 12-23: Unused. */
-	u_int8_t  unused1[1];	/*    24: Unused. */
-	u_int8_t  type;		/*    25: Page type. */
-	u_int8_t  unused2[2];	/* 26-27: Unused. */
-	u_int8_t  chksum[DB_MAC_KEY]; /* 28-47: Checksum */
-	u_int8_t  iv[DB_IV_BYTES]; /* 48-63: IV */
-} QPAGE;
-
-#define	QPAGE_SZ(dbp)						\
-	(F_ISSET((dbp), DB_AM_ENCRYPT) ? QPAGE_SEC :		\
-	F_ISSET((dbp), DB_AM_CHKSUM) ? QPAGE_CHKSUM : QPAGE_NORMAL)
-/*
- * !!!
- * The next_pgno and prev_pgno fields are not maintained for btree and recno
- * internal pages.  Doing so only provides a minor performance improvement,
- * it's hard to do when deleting internal pages, and it increases the chance
- * of deadlock during deletes and splits because we have to re-link pages at
- * more than the leaf level.
- *
- * !!!
- * The btree/recno access method needs db_recno_t bytes of space on the root
- * page to specify how many records are stored in the tree.  (The alternative
- * is to store the number of records in the meta-data page, which will create
- * a second hot spot in trees being actively modified, or recalculate it from
- * the BINTERNAL fields on each access.)  Overload the PREV_PGNO field.
- */
-#define	RE_NREC(p)							\
-	((TYPE(p) == P_IBTREE || TYPE(p) == P_IRECNO) ?	PREV_PGNO(p) :	\
-	(db_pgno_t)(TYPE(p) == P_LBTREE ? NUM_ENT(p) / 2 : NUM_ENT(p)))
-#define	RE_NREC_ADJ(p, adj)						\
-	PREV_PGNO(p) += adj;
-#define	RE_NREC_SET(p, num)						\
-	PREV_PGNO(p) = num;
-
-/*
- * Initialize a page.
- *
- * !!!
- * Don't modify the page's LSN, code depends on it being unchanged after a
- * P_INIT call.
- */
-#define	P_INIT(pg, pg_size, n, pg_prev, pg_next, btl, pg_type) do {	\
-	PGNO(pg) = n;							\
-	PREV_PGNO(pg) = pg_prev;					\
-	NEXT_PGNO(pg) = pg_next;					\
-	NUM_ENT(pg) = 0;						\
-	HOFFSET(pg) = pg_size;						\
-	LEVEL(pg) = btl;						\
-	TYPE(pg) = pg_type;						\
-} while (0)
-
-/* Page header length (offset to first index). */
-#define	P_OVERHEAD(dbp)	P_TO_UINT16(P_INP(dbp, 0))
-
-/* First free byte. */
-#define	LOFFSET(dbp, pg)						\
-    (P_OVERHEAD(dbp) + NUM_ENT(pg) * sizeof(db_indx_t))
-
-/* Free space on a regular page. */
-#define	P_FREESPACE(dbp, pg)	(HOFFSET(pg) - LOFFSET(dbp, pg))
-
-/* Get a pointer to the bytes at a specific index. */
-#define	P_ENTRY(dbp, pg, indx)	((u_int8_t *)pg + P_INP(dbp, pg)[indx])
-
-/************************************************************************
- OVERFLOW PAGE LAYOUT
- ************************************************************************/
-
-/*
- * Overflow items are referenced by HOFFPAGE and BOVERFLOW structures, which
- * store a page number (the first page of the overflow item) and a length
- * (the total length of the overflow item).  The overflow item consists of
- * some number of overflow pages, linked by the next_pgno field of the page.
- * A next_pgno field of PGNO_INVALID flags the end of the overflow item.
- *
- * Overflow page overloads:
- *	The amount of overflow data stored on each page is stored in the
- *	hf_offset field.
- *
- *	The implementation reference counts overflow items as it's possible
- *	for them to be promoted onto btree internal pages.  The reference
- *	count is stored in the entries field.
- */
-#define	OV_LEN(p)	(((PAGE *)p)->hf_offset)
-#define	OV_REF(p)	(((PAGE *)p)->entries)
-
-/* Maximum number of bytes that you can put on an overflow page. */
-#define	P_MAXSPACE(dbp, psize)	((psize) - P_OVERHEAD(dbp))
-
-/* Free space on an overflow page. */
-#define	P_OVFLSPACE(dbp, psize, pg)	(P_MAXSPACE(dbp, psize) - HOFFSET(pg))
-
-/************************************************************************
- HASH PAGE LAYOUT
- ************************************************************************/
-
-/* Each index references a group of bytes on the page. */
-#define	H_KEYDATA	1	/* Key/data item. */
-#define	H_DUPLICATE	2	/* Duplicate key/data item. */
-#define	H_OFFPAGE	3	/* Overflow key/data item. */
-#define	H_OFFDUP	4	/* Overflow page of duplicates. */
-
-/*
- * !!!
- * Items on hash pages are (potentially) unaligned, so we can never cast the
- * (page + offset) pointer to an HKEYDATA, HOFFPAGE or HOFFDUP structure, as
- * we do with B+tree on-page structures.  Because we frequently want the type
- * field, it requires no alignment, and it's in the same location in all three
- * structures, there's a pair of macros.
- */
-#define	HPAGE_PTYPE(p)		(*(u_int8_t *)p)
-#define	HPAGE_TYPE(dbp, pg, indx)	(*P_ENTRY(dbp, pg, indx))
-
-/*
- * The first and second types are H_KEYDATA and H_DUPLICATE, represented
- * by the HKEYDATA structure:
- *
- *	+-----------------------------------+
- *	|    type   | key/data ...          |
- *	+-----------------------------------+
- *
- * For duplicates, the data field encodes duplicate elements in the data
- * field:
- *
- *	+---------------------------------------------------------------+
- *	|    type   | len1 | element1 | len1 | len2 | element2 | len2   |
- *	+---------------------------------------------------------------+
- *
- * Thus, by keeping track of the offset in the element, we can do both
- * backward and forward traversal.
- */
-typedef struct _hkeydata {
-	u_int8_t  type;		/*    00: Page type. */
-	u_int8_t  data[1];	/* Variable length key/data item. */
-} HKEYDATA;
-#define	HKEYDATA_DATA(p)	(((u_int8_t *)p) + SSZA(HKEYDATA, data))
-
-/*
- * The length of any HKEYDATA item. Note that indx is an element index,
- * not a PAIR index.
- */
-#define	LEN_HITEM(dbp, pg, pgsize, indx)				\
-	(((indx) == 0 ? pgsize :					\
-	(P_INP(dbp, pg)[indx - 1])) - (P_INP(dbp, pg)[indx]))
-
-#define	LEN_HKEYDATA(dbp, pg, psize, indx)				\
-	(db_indx_t)(LEN_HITEM(dbp, pg, psize, indx) - HKEYDATA_SIZE(0))
-
-/*
- * Page space required to add a new HKEYDATA item to the page, with and
- * without the index value.
- */
-#define	HKEYDATA_SIZE(len)						\
-	((len) + SSZA(HKEYDATA, data))
-#define	HKEYDATA_PSIZE(len)						\
-	(HKEYDATA_SIZE(len) + sizeof(db_indx_t))
-
-/* Put a HKEYDATA item at the location referenced by a page entry. */
-#define	PUT_HKEYDATA(pe, kd, len, type) {				\
-	((HKEYDATA *)pe)->type = type;					\
-	memcpy((u_int8_t *)pe + sizeof(u_int8_t), kd, len);		\
-}
-
-/*
- * Macros the describe the page layout in terms of key-data pairs.
- */
-#define	H_NUMPAIRS(pg)			(NUM_ENT(pg) / 2)
-#define	H_KEYINDEX(indx)		(indx)
-#define	H_DATAINDEX(indx)		((indx) + 1)
-#define	H_PAIRKEY(dbp, pg, indx)	P_ENTRY(dbp, pg, H_KEYINDEX(indx))
-#define	H_PAIRDATA(dbp, pg, indx)	P_ENTRY(dbp, pg, H_DATAINDEX(indx))
-#define	H_PAIRSIZE(dbp, pg, psize, indx)				\
-	(LEN_HITEM(dbp, pg, psize, H_KEYINDEX(indx)) +			\
-	LEN_HITEM(dbp, pg, psize, H_DATAINDEX(indx)))
-#define	LEN_HDATA(dbp, p, psize, indx)					\
-    LEN_HKEYDATA(dbp, p, psize, H_DATAINDEX(indx))
-#define	LEN_HKEY(dbp, p, psize, indx)					\
-    LEN_HKEYDATA(dbp, p, psize, H_KEYINDEX(indx))
-
-/*
- * The third type is the H_OFFPAGE, represented by the HOFFPAGE structure:
- */
-typedef struct _hoffpage {
-	u_int8_t  type;		/*    00: Page type and delete flag. */
-	u_int8_t  unused[3];	/* 01-03: Padding, unused. */
-	db_pgno_t pgno;		/* 04-07: Offpage page number. */
-	u_int32_t tlen;		/* 08-11: Total length of item. */
-} HOFFPAGE;
-
-#define	HOFFPAGE_PGNO(p)	(((u_int8_t *)p) + SSZ(HOFFPAGE, pgno))
-#define	HOFFPAGE_TLEN(p)	(((u_int8_t *)p) + SSZ(HOFFPAGE, tlen))
-
-/*
- * Page space required to add a new HOFFPAGE item to the page, with and
- * without the index value.
- */
-#define	HOFFPAGE_SIZE		(sizeof(HOFFPAGE))
-#define	HOFFPAGE_PSIZE		(HOFFPAGE_SIZE + sizeof(db_indx_t))
-
-/*
- * The fourth type is H_OFFDUP represented by the HOFFDUP structure:
- */
-typedef struct _hoffdup {
-	u_int8_t  type;		/*    00: Page type and delete flag. */
-	u_int8_t  unused[3];	/* 01-03: Padding, unused. */
-	db_pgno_t pgno;		/* 04-07: Offpage page number. */
-} HOFFDUP;
-#define	HOFFDUP_PGNO(p)		(((u_int8_t *)p) + SSZ(HOFFDUP, pgno))
-
-/*
- * Page space required to add a new HOFFDUP item to the page, with and
- * without the index value.
- */
-#define	HOFFDUP_SIZE		(sizeof(HOFFDUP))
-
-/************************************************************************
- BTREE PAGE LAYOUT
- ************************************************************************/
-
-/* Each index references a group of bytes on the page. */
-#define	B_KEYDATA	1	/* Key/data item. */
-#define	B_DUPLICATE	2	/* Duplicate key/data item. */
-#define	B_OVERFLOW	3	/* Overflow key/data item. */
-
-/*
- * We have to store a deleted entry flag in the page.   The reason is complex,
- * but the simple version is that we can't delete on-page items referenced by
- * a cursor -- the return order of subsequent insertions might be wrong.  The
- * delete flag is an overload of the top bit of the type byte.
- */
-#define	B_DELETE	(0x80)
-#define	B_DCLR(t)	(t) &= ~B_DELETE
-#define	B_DSET(t)	(t) |= B_DELETE
-#define	B_DISSET(t)	((t) & B_DELETE)
-
-#define	B_TYPE(t)	((t) & ~B_DELETE)
-#define	B_TSET(t, type, deleted) {					\
-	(t) = (type);							\
-	if (deleted)							\
-		B_DSET(t);						\
-}
-
-/*
- * The first type is B_KEYDATA, represented by the BKEYDATA structure:
- */
-typedef struct _bkeydata {
-	db_indx_t len;		/* 00-01: Key/data item length. */
-	u_int8_t  type;		/*    02: Page type AND DELETE FLAG. */
-	u_int8_t  data[1];	/* Variable length key/data item. */
-} BKEYDATA;
-
-/* Get a BKEYDATA item for a specific index. */
-#define	GET_BKEYDATA(dbp, pg, indx)					\
-	((BKEYDATA *)P_ENTRY(dbp, pg, indx))
-
-/*
- * Page space required to add a new BKEYDATA item to the page, with and
- * without the index value.
- */
-#define	BKEYDATA_SIZE(len)						\
-	ALIGN((len) + SSZA(BKEYDATA, data), sizeof(u_int32_t))
-#define	BKEYDATA_PSIZE(len)						\
-	(BKEYDATA_SIZE(len) + sizeof(db_indx_t))
-
-/*
- * The second and third types are B_DUPLICATE and B_OVERFLOW, represented
- * by the BOVERFLOW structure.
- */
-typedef struct _boverflow {
-	db_indx_t unused1;	/* 00-01: Padding, unused. */
-	u_int8_t  type;		/*    02: Page type AND DELETE FLAG. */
-	u_int8_t  unused2;	/*    03: Padding, unused. */
-	db_pgno_t pgno;		/* 04-07: Next page number. */
-	u_int32_t tlen;		/* 08-11: Total length of item. */
-} BOVERFLOW;
-
-/* Get a BOVERFLOW item for a specific index. */
-#define	GET_BOVERFLOW(dbp, pg, indx)					\
-	((BOVERFLOW *)P_ENTRY(dbp, pg, indx))
-
-/*
- * Page space required to add a new BOVERFLOW item to the page, with and
- * without the index value.  The (u_int16_t) cast avoids warnings: ALIGN
- * casts to db_align_t, the cast converts it to a small integral type so
- * we don't get complaints when we assign the final result to an integral
- * type smaller than db_align_t.
- */
-#define	BOVERFLOW_SIZE							\
-	((u_int16_t)ALIGN(sizeof(BOVERFLOW), sizeof(u_int32_t)))
-#define	BOVERFLOW_PSIZE							\
-	(BOVERFLOW_SIZE + sizeof(db_indx_t))
-
-/*
- * Btree leaf and hash page layouts group indices in sets of two, one for the
- * key and one for the data.  Everything else does it in sets of one to save
- * space.  Use the following macros so that it's real obvious what's going on.
- */
-#define	O_INDX	1
-#define	P_INDX	2
-
-/************************************************************************
- BTREE INTERNAL PAGE LAYOUT
- ************************************************************************/
-
-/*
- * Btree internal entry.
- */
-typedef struct _binternal {
-	db_indx_t  len;		/* 00-01: Key/data item length. */
-	u_int8_t   type;	/*    02: Page type AND DELETE FLAG. */
-	u_int8_t   unused;	/*    03: Padding, unused. */
-	db_pgno_t  pgno;	/* 04-07: Page number of referenced page. */
-	db_recno_t nrecs;	/* 08-11: Subtree record count. */
-	u_int8_t   data[1];	/* Variable length key item. */
-} BINTERNAL;
-
-/* Get a BINTERNAL item for a specific index. */
-#define	GET_BINTERNAL(dbp, pg, indx)					\
-	((BINTERNAL *)P_ENTRY(dbp, pg, indx))
-
-/*
- * Page space required to add a new BINTERNAL item to the page, with and
- * without the index value.
- */
-#define	BINTERNAL_SIZE(len)						\
-	ALIGN((len) + SSZA(BINTERNAL, data), sizeof(u_int32_t))
-#define	BINTERNAL_PSIZE(len)						\
-	(BINTERNAL_SIZE(len) + sizeof(db_indx_t))
-
-/************************************************************************
- RECNO INTERNAL PAGE LAYOUT
- ************************************************************************/
-
-/*
- * The recno internal entry.
- */
-typedef struct _rinternal {
-	db_pgno_t  pgno;	/* 00-03: Page number of referenced page. */
-	db_recno_t nrecs;	/* 04-07: Subtree record count. */
-} RINTERNAL;
-
-/* Get a RINTERNAL item for a specific index. */
-#define	GET_RINTERNAL(dbp, pg, indx)					\
-	((RINTERNAL *)P_ENTRY(dbp, pg, indx))
-
-/*
- * Page space required to add a new RINTERNAL item to the page, with and
- * without the index value.
- */
-#define	RINTERNAL_SIZE							\
-	ALIGN(sizeof(RINTERNAL), sizeof(u_int32_t))
-#define	RINTERNAL_PSIZE							\
-	(RINTERNAL_SIZE + sizeof(db_indx_t))
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* !_DB_PAGE_H_ */
diff --git a/bdb/dbinc/db_server_int.h b/bdb/dbinc/db_server_int.h
deleted file mode 100644
index efec539b2f8..00000000000
--- a/bdb/dbinc/db_server_int.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2000-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: db_server_int.h,v 1.23 2002/02/12 15:01:24 sue Exp $
- */
-
-#ifndef _DB_SERVER_INT_H_
-#define	_DB_SERVER_INT_H_
-
-#define	DB_SERVER_TIMEOUT	300	/* 5 minutes */
-#define	DB_SERVER_MAXTIMEOUT	1200	/* 20 minutes */
-#define	DB_SERVER_IDLETIMEOUT	86400	/* 1 day */
-
-/*
- * Ignore/mask off the following env->open flags:
- * Most are illegal for a client to specify as they would control
- * server resource usage.  We will just ignore them.
- *	DB_LOCKDOWN
- *	DB_PRIVATE
- *	DB_RECOVER
- *	DB_RECOVER_FATAL
- *	DB_SYSTEM_MEM
- *	DB_USE_ENVIRON, DB_USE_ENVIRON_ROOT	- handled on client
- */
-#define	DB_SERVER_FLAGMASK	(					\
-DB_LOCKDOWN | DB_PRIVATE | DB_RECOVER | DB_RECOVER_FATAL |		\
-DB_SYSTEM_MEM | DB_USE_ENVIRON | DB_USE_ENVIRON_ROOT)
-
-#define	CT_CURSOR	0x001		/* Cursor */
-#define	CT_DB		0x002		/* Database */
-#define	CT_ENV		0x004		/* Env */
-#define	CT_TXN		0x008		/* Txn */
-
-#define	CT_JOIN		0x10000000	/* Join cursor component */
-#define	CT_JOINCUR	0x20000000	/* Join cursor */
-
-typedef struct home_entry home_entry;
-struct home_entry {
-	LIST_ENTRY(home_entry) entries;
-	char *home;
-	char *dir;
-	char *name;
-	char *passwd;
-};
-
-/*
- * Data needed for sharing handles.
- * To share an env handle, on the open call, they must have matching
- * env flags, and matching set_flags.
- *
- * To share a db handle on the open call, the db, subdb and flags must
- * all be the same.
- */
-#define	DB_SERVER_ENVFLAGS	 (					\
-DB_INIT_CDB | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL |		\
-DB_INIT_TXN | DB_JOINENV)
-
-#define	DB_SERVER_DBFLAGS	 (DB_DIRTY_READ | DB_NOMMAP | DB_RDONLY)
-#define	DB_SERVER_DBNOSHARE	 (DB_EXCL | DB_TRUNCATE)
-
-typedef struct ct_envdata ct_envdata;
-typedef struct ct_dbdata ct_dbdata;
-struct ct_envdata {
-	u_int32_t	envflags;
-	u_int32_t	onflags;
-	u_int32_t	offflags;
-	home_entry	*home;
-};
-
-struct ct_dbdata {
-	u_int32_t	dbflags;
-	u_int32_t	setflags;
-	char		*db;
-	char		*subdb;
-	DBTYPE		type;
-};
-
-/*
- * We maintain an activity timestamp for each handle.  However, we
- * set it to point, possibly to the ct_active field of its own handle
- * or it may point to the ct_active field of a parent.  In the case
- * of nested transactions and any cursors within transactions it must
- * point to the ct_active field of the ultimate parent of the transaction
- * no matter how deeply it is nested.
- */
-typedef struct ct_entry ct_entry;
-struct ct_entry {
-	LIST_ENTRY(ct_entry) entries;		/* List of entries */
-	union {
-#ifdef __cplusplus
-		DbEnv *envp;			/* H_ENV */
-		DbTxn *txnp;			/* H_TXN */
-		Db *dbp;			/* H_DB */
-		Dbc *dbc;			/* H_CURSOR */
-#else
-		DB_ENV *envp;			/* H_ENV */
-		DB_TXN *txnp;			/* H_TXN */
-		DB *dbp;			/* H_DB */
-		DBC *dbc;			/* H_CURSOR */
-#endif
-		void *anyp;
-	} handle_u;
-	union {					/* Private data per type */
-		ct_envdata	envdp;		/* Env info */
-		ct_dbdata	dbdp;		/* Db info */
-	} private_u;
-	long ct_id;				/* Client ID */
-	long *ct_activep;			/* Activity timestamp pointer*/
-	long *ct_origp;				/* Original timestamp pointer*/
-	long ct_active;				/* Activity timestamp */
-	long ct_timeout;			/* Resource timeout */
-	long ct_idle;				/* Idle timeout */
-	u_int32_t ct_refcount;			/* Ref count for sharing */
-	u_int32_t ct_type;			/* This entry's type */
-	struct ct_entry *ct_parent;		/* Its parent */
-	struct ct_entry *ct_envparent;		/* Its environment */
-};
-
-#define	ct_envp handle_u.envp
-#define	ct_txnp handle_u.txnp
-#define	ct_dbp handle_u.dbp
-#define	ct_dbc handle_u.dbc
-#define	ct_anyp handle_u.anyp
-
-#define	ct_envdp private_u.envdp
-#define	ct_dbdp private_u.dbdp
-
-extern int __dbsrv_verbose;
-
-/*
- * Get ctp and activate it.
- * Assumes local variable 'replyp'.
- * NOTE: May 'return' from macro.
- */
-#define	ACTIVATE_CTP(ctp, id, type) {		\
-	(ctp) = get_tableent(id);		\
-	if ((ctp) == NULL) {			\
-		replyp->status = DB_NOSERVER_ID;\
-		return;				\
-	}					\
-	DB_ASSERT((ctp)->ct_type & (type));	\
-	__dbsrv_active(ctp);			\
-}
-
-#endif	/* !_DB_SERVER_INT_H_ */
diff --git a/bdb/dbinc/db_shash.h b/bdb/dbinc/db_shash.h
deleted file mode 100644
index 2c54d6145c5..00000000000
--- a/bdb/dbinc/db_shash.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: db_shash.h,v 11.11 2002/01/11 15:52:26 bostic Exp $
- */
-
-#ifndef	_DB_SHASH_H_
-#define	_DB_SHASH_H_
-
-/* Hash Headers */
-typedef	SH_TAILQ_HEAD(__hash_head) DB_HASHTAB;
-
-/*
- * HASHLOOKUP --
- *
- * Look up something in a shared memory hash table.  The "elt" argument
- * should be a key, and cmp_func must know how to compare a key to whatever
- * structure it is that appears in the hash table.  The comparison function
- *
- * begin: address of the beginning of the hash table.
- * ndx:	  index into table for this item.
- * type:  the structure type of the elements that are linked in each bucket.
- * field: the name of the field by which the "type" structures are linked.
- * elt:   the item for which we are searching in the hash table.
- * res:   the variable into which we'll store the element if we find it.
- * cmp:   called as: cmp(lookup_elt, table_elt).
- *
- * If the element is not in the hash table, this macro exits with res set
- * to NULL.
- */
-#define	HASHLOOKUP(begin, ndx, type, field, elt, res, cmp) do {		\
-	DB_HASHTAB *__bucket;						\
-									\
-	__bucket = &begin[ndx];						\
-	for (res = SH_TAILQ_FIRST(__bucket, type);			\
-	    res != NULL; res = SH_TAILQ_NEXT(res, field, type))		\
-		if (cmp(elt, res))					\
-			break;						\
-} while (0)
-
-/*
- * HASHINSERT --
- *
- * Insert a new entry into the hash table.  This assumes that you already
- * have the bucket locked and that lookup has failed; don't call it if you
- * haven't already called HASHLOOKUP.  If you do, you could get duplicate
- * entries.
- *
- * begin: the beginning address of the hash table.
- * ndx:   the index for this element.
- * type:  the structure type of the elements that are linked in each bucket.
- * field: the name of the field by which the "type" structures are linked.
- * elt:   the item to be inserted.
- */
-#define	HASHINSERT(begin, ndx, type, field, elt) do {			\
-	DB_HASHTAB *__bucket;						\
-									\
-	__bucket = &begin[ndx];						\
-	SH_TAILQ_INSERT_HEAD(__bucket, elt, field, type);		\
-} while (0)
-
-/*
- * HASHREMOVE_EL --
- *	Given the object "obj" in the table, remove it.
- *
- * begin: address of the beginning of the hash table.
- * ndx:   index into hash table of where this element belongs.
- * type:  the structure type of the elements that are linked in each bucket.
- * field: the name of the field by which the "type" structures are linked.
- * obj:   the object in the table that we with to delete.
- */
-#define	HASHREMOVE_EL(begin, ndx, type, field, obj) {			\
-	DB_HASHTAB *__bucket;						\
-									\
-	__bucket = &begin[ndx];						\
-	SH_TAILQ_REMOVE(__bucket, obj, field, type);			\
-}
-#endif /* !_DB_SHASH_H_ */
diff --git a/bdb/dbinc/db_swap.h b/bdb/dbinc/db_swap.h
deleted file mode 100644
index d5aad65385e..00000000000
--- a/bdb/dbinc/db_swap.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- */
-/*
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: db_swap.h,v 11.8 2002/01/11 15:52:26 bostic Exp $
- */
-
-#ifndef _DB_SWAP_H_
-#define	_DB_SWAP_H_
-
-/*
- * Little endian <==> big endian 32-bit swap macros.
- *	M_32_SWAP	swap a memory location
- *	P_32_COPY	copy potentially unaligned 4 byte quantities
- *	P_32_SWAP	swap a referenced memory location
- */
-#define	M_32_SWAP(a) {							\
-	u_int32_t _tmp;							\
-	_tmp = a;							\
-	((u_int8_t *)&a)[0] = ((u_int8_t *)&_tmp)[3];			\
-	((u_int8_t *)&a)[1] = ((u_int8_t *)&_tmp)[2];			\
-	((u_int8_t *)&a)[2] = ((u_int8_t *)&_tmp)[1];			\
-	((u_int8_t *)&a)[3] = ((u_int8_t *)&_tmp)[0];			\
-}
-#define	P_32_COPY(a, b) {						\
-	((u_int8_t *)b)[0] = ((u_int8_t *)a)[0];			\
-	((u_int8_t *)b)[1] = ((u_int8_t *)a)[1];			\
-	((u_int8_t *)b)[2] = ((u_int8_t *)a)[2];			\
-	((u_int8_t *)b)[3] = ((u_int8_t *)a)[3];			\
-}
-#define	P_32_SWAP(a) {							\
-	u_int32_t _tmp;							\
-	P_32_COPY(a, &_tmp);						\
-	((u_int8_t *)a)[0] = ((u_int8_t *)&_tmp)[3];			\
-	((u_int8_t *)a)[1] = ((u_int8_t *)&_tmp)[2];			\
-	((u_int8_t *)a)[2] = ((u_int8_t *)&_tmp)[1];			\
-	((u_int8_t *)a)[3] = ((u_int8_t *)&_tmp)[0];			\
-}
-
-/*
- * Little endian <==> big endian 16-bit swap macros.
- *	M_16_SWAP	swap a memory location
- *	P_16_COPY	copy potentially unaligned 2 byte quantities
- *	P_16_SWAP	swap a referenced memory location
- */
-#define	M_16_SWAP(a) {							\
-	u_int16_t _tmp;							\
-	_tmp = (u_int16_t)a;						\
-	((u_int8_t *)&a)[0] = ((u_int8_t *)&_tmp)[1];			\
-	((u_int8_t *)&a)[1] = ((u_int8_t *)&_tmp)[0];			\
-}
-#define	P_16_COPY(a, b) {						\
-	((u_int8_t *)b)[0] = ((u_int8_t *)a)[0];			\
-	((u_int8_t *)b)[1] = ((u_int8_t *)a)[1];			\
-}
-#define	P_16_SWAP(a) {							\
-	u_int16_t _tmp;							\
-	P_16_COPY(a, &_tmp);						\
-	((u_int8_t *)a)[0] = ((u_int8_t *)&_tmp)[1];			\
-	((u_int8_t *)a)[1] = ((u_int8_t *)&_tmp)[0];			\
-}
-
-#define	SWAP32(p) {							\
-	P_32_SWAP(p);							\
-	(p) += sizeof(u_int32_t);					\
-}
-#define	SWAP16(p) {							\
-	P_16_SWAP(p);							\
-	(p) += sizeof(u_int16_t);					\
-}
-
-/*
- * Berkeley DB has local versions of htonl() and ntohl() that operate on
- * pointers to the right size memory locations; the portability magic for
- * finding the real system functions isn't worth the effort.
- */
-#define	DB_HTONL(p) do {						\
-	if (!__db_isbigendian())					\
-		P_32_SWAP(p);						\
-} while (0)
-#define	DB_NTOHL(p) do {						\
-	if (!__db_isbigendian())					\
-		P_32_SWAP(p);						\
-} while (0)
-
-#endif /* !_DB_SWAP_H_ */
diff --git a/bdb/dbinc/db_upgrade.h b/bdb/dbinc/db_upgrade.h
deleted file mode 100644
index 3ccba810889..00000000000
--- a/bdb/dbinc/db_upgrade.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: db_upgrade.h,v 1.10 2002/01/11 15:52:26 bostic Exp $
- */
-
-#ifndef _DB_UPGRADE_H_
-#define	_DB_UPGRADE_H_
-
-/*
- * This file defines the metadata pages from the previous release.
- * These structures are only used to upgrade old versions of databases.
- */
-
-/* Structures from the 3.1 release */
-typedef struct _dbmeta31 {
-	DB_LSN	  lsn;		/* 00-07: LSN. */
-	db_pgno_t pgno;		/* 08-11: Current page number. */
-	u_int32_t magic;	/* 12-15: Magic number. */
-	u_int32_t version;	/* 16-19: Version. */
-	u_int32_t pagesize;	/* 20-23: Pagesize. */
-	u_int8_t  unused1[1];	/*    24: Unused. */
-	u_int8_t  type;		/*    25: Page type. */
-	u_int8_t  unused2[2];	/* 26-27: Unused. */
-	u_int32_t free;		/* 28-31: Free list page number. */
-	DB_LSN    unused3;	/* 36-39: Unused. */
-	u_int32_t key_count;	/* 40-43: Cached key count. */
-	u_int32_t record_count;	/* 44-47: Cached record count. */
-	u_int32_t flags;	/* 48-51: Flags: unique to each AM. */
-				/* 52-71: Unique file ID. */
-	u_int8_t  uid[DB_FILE_ID_LEN];
-} DBMETA31;
-
-typedef struct _btmeta31 {
-	DBMETA31  dbmeta;		/* 00-71: Generic meta-data header. */
-
-	u_int32_t maxkey;	/* 72-75: Btree: Maxkey. */
-	u_int32_t minkey;	/* 76-79: Btree: Minkey. */
-	u_int32_t re_len;	/* 80-83: Recno: fixed-length record length. */
-	u_int32_t re_pad;	/* 84-87: Recno: fixed-length record pad. */
-	u_int32_t root;		/* 88-92: Root page. */
-
-	/*
-	 * Minimum page size is 128.
-	 */
-} BTMETA31;
-
-/************************************************************************
- HASH METADATA PAGE LAYOUT
- ************************************************************************/
-typedef struct _hashmeta31 {
-	DBMETA31 dbmeta;	/* 00-71: Generic meta-data page header. */
-
-	u_int32_t max_bucket;	/* 72-75: ID of Maximum bucket in use */
-	u_int32_t high_mask;	/* 76-79: Modulo mask into table */
-	u_int32_t low_mask;	/* 80-83: Modulo mask into table lower half */
-	u_int32_t ffactor;	/* 84-87: Fill factor */
-	u_int32_t nelem;	/* 88-91: Number of keys in hash table */
-	u_int32_t h_charkey;	/* 92-95: Value of hash(CHARKEY) */
-#define	NCACHED	32		/* number of spare points */
-				/* 96-223: Spare pages for overflow */
-	u_int32_t spares[NCACHED];
-
-	/*
-	 * Minimum page size is 256.
-	 */
-} HMETA31;
-
-/*
- * QAM Meta data page structure
- *
- */
-typedef struct _qmeta31 {
-	DBMETA31 dbmeta;	/* 00-71: Generic meta-data header. */
-
-	u_int32_t start;	/* 72-75: Start offset. */
-	u_int32_t first_recno;	/* 76-79: First not deleted record. */
-	u_int32_t cur_recno;	/* 80-83: Last recno allocated. */
-	u_int32_t re_len;	/* 84-87: Fixed-length record length. */
-	u_int32_t re_pad;	/* 88-91: Fixed-length record pad. */
-	u_int32_t rec_page;	/* 92-95: Records Per Page. */
-
-	/*
-	 * Minimum page size is 128.
-	 */
-} QMETA31;
-/* Structures from the 3.2 release */
-typedef struct _qmeta32 {
-	DBMETA31 dbmeta;	/* 00-71: Generic meta-data header. */
-
-	u_int32_t first_recno;	/* 72-75: First not deleted record. */
-	u_int32_t cur_recno;	/* 76-79: Last recno allocated. */
-	u_int32_t re_len;	/* 80-83: Fixed-length record length. */
-	u_int32_t re_pad;	/* 84-87: Fixed-length record pad. */
-	u_int32_t rec_page;	/* 88-91: Records Per Page. */
-	u_int32_t page_ext;	/* 92-95: Pages per extent */
-
-	/*
-	 * Minimum page size is 128.
-	 */
-} QMETA32;
-
-/* Structures from the 3.0 release */
-
-typedef struct _dbmeta30 {
-	DB_LSN	  lsn;		/* 00-07: LSN. */
-	db_pgno_t pgno;		/* 08-11: Current page number. */
-	u_int32_t magic;	/* 12-15: Magic number. */
-	u_int32_t version;	/* 16-19: Version. */
-	u_int32_t pagesize;	/* 20-23: Pagesize. */
-	u_int8_t  unused1[1];	/*    24: Unused. */
-	u_int8_t  type;		/*    25: Page type. */
-	u_int8_t  unused2[2];	/* 26-27: Unused. */
-	u_int32_t free;		/* 28-31: Free list page number. */
-	u_int32_t flags;	/* 32-35: Flags: unique to each AM. */
-				/* 36-55: Unique file ID. */
-	u_int8_t  uid[DB_FILE_ID_LEN];
-} DBMETA30;
-
-/************************************************************************
- BTREE METADATA PAGE LAYOUT
- ************************************************************************/
-typedef struct _btmeta30 {
-	DBMETA30	dbmeta;	/* 00-55: Generic meta-data header. */
-
-	u_int32_t maxkey;	/* 56-59: Btree: Maxkey. */
-	u_int32_t minkey;	/* 60-63: Btree: Minkey. */
-	u_int32_t re_len;	/* 64-67: Recno: fixed-length record length. */
-	u_int32_t re_pad;	/* 68-71: Recno: fixed-length record pad. */
-	u_int32_t root;		/* 72-75: Root page. */
-
-	/*
-	 * Minimum page size is 128.
-	 */
-} BTMETA30;
-
-/************************************************************************
- HASH METADATA PAGE LAYOUT
- ************************************************************************/
-typedef struct _hashmeta30 {
-	DBMETA30 dbmeta;	/* 00-55: Generic meta-data page header. */
-
-	u_int32_t max_bucket;	/* 56-59: ID of Maximum bucket in use */
-	u_int32_t high_mask;	/* 60-63: Modulo mask into table */
-	u_int32_t low_mask;	/* 64-67: Modulo mask into table lower half */
-	u_int32_t ffactor;	/* 68-71: Fill factor */
-	u_int32_t nelem;	/* 72-75: Number of keys in hash table */
-	u_int32_t h_charkey;	/* 76-79: Value of hash(CHARKEY) */
-#define	NCACHED30	32		/* number of spare points */
-				/* 80-207: Spare pages for overflow */
-	u_int32_t spares[NCACHED30];
-
-	/*
-	 * Minimum page size is 256.
-	 */
-} HMETA30;
-
-/************************************************************************
- QUEUE METADATA PAGE LAYOUT
- ************************************************************************/
-/*
- * QAM Meta data page structure
- *
- */
-typedef struct _qmeta30 {
-	DBMETA30    dbmeta;	/* 00-55: Generic meta-data header. */
-
-	u_int32_t start;	/* 56-59: Start offset. */
-	u_int32_t first_recno;	/* 60-63: First not deleted record. */
-	u_int32_t cur_recno;	/* 64-67: Last recno allocated. */
-	u_int32_t re_len;	/* 68-71: Fixed-length record length. */
-	u_int32_t re_pad;	/* 72-75: Fixed-length record pad. */
-	u_int32_t rec_page;	/* 76-79: Records Per Page. */
-
-	/*
-	 * Minimum page size is 128.
-	 */
-} QMETA30;
-
-/* Structures from Release 2.x */
-
-/************************************************************************
- BTREE METADATA PAGE LAYOUT
- ************************************************************************/
-
-/*
- * Btree metadata page layout:
- */
-typedef struct _btmeta2X {
-	DB_LSN	  lsn;		/* 00-07: LSN. */
-	db_pgno_t pgno;		/* 08-11: Current page number. */
-	u_int32_t magic;	/* 12-15: Magic number. */
-	u_int32_t version;	/* 16-19: Version. */
-	u_int32_t pagesize;	/* 20-23: Pagesize. */
-	u_int32_t maxkey;	/* 24-27: Btree: Maxkey. */
-	u_int32_t minkey;	/* 28-31: Btree: Minkey. */
-	u_int32_t free;		/* 32-35: Free list page number. */
-	u_int32_t flags;	/* 36-39: Flags. */
-	u_int32_t re_len;	/* 40-43: Recno: fixed-length record length. */
-	u_int32_t re_pad;	/* 44-47: Recno: fixed-length record pad. */
-				/* 48-67: Unique file ID. */
-	u_int8_t  uid[DB_FILE_ID_LEN];
-} BTMETA2X;
-
-/************************************************************************
- HASH METADATA PAGE LAYOUT
- ************************************************************************/
-
-/*
- * Hash metadata page layout:
- */
-/* Hash Table Information */
-typedef struct hashhdr {	/* Disk resident portion */
-	DB_LSN	lsn;		/* 00-07: LSN of the header page */
-	db_pgno_t pgno;		/* 08-11: Page number (btree compatibility). */
-	u_int32_t magic;	/* 12-15: Magic NO for hash tables */
-	u_int32_t version;	/* 16-19: Version ID */
-	u_int32_t pagesize;	/* 20-23: Bucket/Page Size */
-	u_int32_t ovfl_point;	/* 24-27: Overflow page allocation location */
-	u_int32_t last_freed;	/* 28-31: Last freed overflow page pgno */
-	u_int32_t max_bucket;	/* 32-35: ID of Maximum bucket in use */
-	u_int32_t high_mask;	/* 36-39: Modulo mask into table */
-	u_int32_t low_mask;	/* 40-43: Modulo mask into table lower half */
-	u_int32_t ffactor;	/* 44-47: Fill factor */
-	u_int32_t nelem;	/* 48-51: Number of keys in hash table */
-	u_int32_t h_charkey;	/* 52-55: Value of hash(CHARKEY) */
-	u_int32_t flags;	/* 56-59: Allow duplicates. */
-#define	NCACHED2X	32		/* number of spare points */
-				/* 60-187: Spare pages for overflow */
-	u_int32_t spares[NCACHED2X];
-				/* 188-207: Unique file ID. */
-	u_int8_t  uid[DB_FILE_ID_LEN];
-
-	/*
-	 * Minimum page size is 256.
-	 */
-} HASHHDR;
-
-#endif /* !_DB_UPGRADE_H_ */
diff --git a/bdb/dbinc/db_verify.h b/bdb/dbinc/db_verify.h
deleted file mode 100644
index 949c9a2a6a1..00000000000
--- a/bdb/dbinc/db_verify.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1999-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: db_verify.h,v 1.26 2002/08/06 06:37:08 bostic Exp $
- */
-
-#ifndef _DB_VERIFY_H_
-#define	_DB_VERIFY_H_
-
-/*
- * Structures and macros for the storage and retrieval of all information
- * needed for inter-page verification of a database.
- */
-
-/*
- * EPRINT is the macro for error printing.  Takes as an arg the arg set
- * for DB->err.
- */
-#define	EPRINT(x)							\
-	do {								\
-		if (!LF_ISSET(DB_SALVAGE))				\
-			__db_err x;					\
-	} while (0)
-
-/* For fatal type errors--i.e., verifier bugs. */
-#define	TYPE_ERR_PRINT(dbenv, func, pgno, ptype)			\
-    EPRINT(((dbenv), "Page %lu: %s called on nonsensical page of type %lu", \
-	(u_long)(pgno), (func), (u_long)(ptype)));
-
-/* Complain about a totally zeroed page where we don't expect one. */
-#define	ZEROPG_ERR_PRINT(dbenv, pgno, str)				   \
-    do {								   \
-	    EPRINT(((dbenv), "Page %lu: %s is of inappropriate type %lu",  \
-		(u_long)(pgno), str, (u_long)P_INVALID));		   \
-	    EPRINT(((dbenv), "Page %lu: totally zeroed page",		   \
-		(u_long)(pgno)));					   \
-    } while (0)
-
-/*
- * Note that 0 is, in general, a valid pgno, despite equalling PGNO_INVALID;
- * we have to test it separately where it's not appropriate.
- */
-#define	IS_VALID_PGNO(x)	((x) <= vdp->last_pgno)
-
-/*
- * Flags understood by the btree structure checks (esp. __bam_vrfy_subtree).
- * These share the same space as the global flags to __db_verify, and must not
- * dip below 0x00010000.
- */
-#define	ST_DUPOK	0x00010000	/* Duplicates are acceptable. */
-#define	ST_DUPSET	0x00020000	/* Subtree is in a duplicate tree. */
-#define	ST_DUPSORT	0x00040000	/* Duplicates are sorted. */
-#define	ST_IS_RECNO	0x00080000	/* Subtree is a recno. */
-#define	ST_OVFL_LEAF	0x00100000	/* Overflow reffed from leaf page. */
-#define	ST_RECNUM	0x00200000	/* Subtree has record numbering on. */
-#define	ST_RELEN	0x00400000	/* Subtree has fixed-length records. */
-#define	ST_TOPLEVEL	0x00800000	/* Subtree == entire tree */
-
-/*
- * Flags understood by __bam_salvage and __db_salvage.  These need not share
- * the same space with the __bam_vrfy_subtree flags, but must share with
- * __db_verify.
- */
-#define	SA_SKIPFIRSTKEY	0x00080000
-
-/*
- * VRFY_DBINFO is the fundamental structure;  it either represents the database
- * of subdatabases, or the sole database if there are no subdatabases.
- */
-struct __vrfy_dbinfo {
-	/* Info about this database in particular. */
-	DBTYPE		type;
-
-	/* List of subdatabase meta pages, if any. */
-	LIST_HEAD(__subdbs, __vrfy_childinfo) subdbs;
-
-	/* File-global info--stores VRFY_PAGEINFOs for each page. */
-	DB *pgdbp;
-
-	/* Child database--stores VRFY_CHILDINFOs of each page. */
-	DB *cdbp;
-
-	/* Page info structures currently in use. */
-	LIST_HEAD(__activepips, __vrfy_pageinfo) activepips;
-
-	/*
-	 * DB we use to keep track of which pages are linked somehow
-	 * during verification.  0 is the default, "unseen";  1 is seen.
-	 */
-	DB *pgset;
-
-	/*
-	 * This is a database we use during salvaging to keep track of which
-	 * overflow and dup pages we need to come back to at the end and print
-	 * with key "UNKNOWN".  Pages which print with a good key get set
-	 * to SALVAGE_IGNORE;  others get set, as appropriate, to SALVAGE_LDUP,
-	 * SALVAGE_LRECNODUP, SALVAGE_OVERFLOW for normal db overflow pages,
-	 * and SALVAGE_BTREE, SALVAGE_LRECNO, and SALVAGE_HASH for subdb
-	 * pages.
-	 */
-#define	SALVAGE_INVALID		0
-#define	SALVAGE_IGNORE		1
-#define	SALVAGE_LDUP		2
-#define	SALVAGE_LRECNODUP	3
-#define	SALVAGE_OVERFLOW	4
-#define	SALVAGE_LBTREE		5
-#define	SALVAGE_HASH		6
-#define	SALVAGE_LRECNO		7
-	DB *salvage_pages;
-
-	db_pgno_t	last_pgno;
-	db_pgno_t	pgs_remaining;	/* For dbp->db_feedback(). */
-
-	/*
-	 * These are used during __bam_vrfy_subtree to keep track, while
-	 * walking up and down the Btree structure, of the prev- and next-page
-	 * chain of leaf pages and verify that it's intact.  Also, make sure
-	 * that this chain contains pages of only one type.
-	 */
-	db_pgno_t	prev_pgno;
-	db_pgno_t	next_pgno;
-	u_int8_t	leaf_type;
-
-	/* Queue needs these to verify data pages in the first pass. */
-	u_int32_t	re_len;
-	u_int32_t	rec_page;
-
-#define	SALVAGE_PRINTABLE	0x01	/* Output printable chars literally. */
-#define	SALVAGE_PRINTHEADER	0x02	/* Print the unknown-key header. */
-#define	SALVAGE_PRINTFOOTER	0x04	/* Print the unknown-key footer. */
-	u_int32_t	flags;
-}; /* VRFY_DBINFO */
-
-/*
- * The amount of state information we need per-page is small enough that
- * it's not worth the trouble to define separate structures for each
- * possible type of page, and since we're doing verification with these we
- * have to be open to the possibility that page N will be of a completely
- * unexpected type anyway.  So we define one structure here with all the
- * info we need for inter-page verification.
- */
-struct __vrfy_pageinfo {
-	u_int8_t	type;
-	u_int8_t	bt_level;
-	u_int8_t	unused1;
-	u_int8_t	unused2;
-	db_pgno_t	pgno;
-	db_pgno_t	prev_pgno;
-	db_pgno_t	next_pgno;
-
-	/* meta pages */
-	db_pgno_t	root;
-	db_pgno_t	free;		/* Free list head. */
-
-	db_indx_t	entries;	/* Actual number of entries. */
-	u_int16_t	unused;
-	db_recno_t	rec_cnt;	/* Record count. */
-	u_int32_t	re_len;		/* Record length. */
-	u_int32_t	bt_minkey;
-	u_int32_t	bt_maxkey;
-	u_int32_t	h_ffactor;
-	u_int32_t	h_nelem;
-
-	/* overflow pages */
-	/*
-	 * Note that refcount is the refcount for an overflow page; pi_refcount
-	 * is this structure's own refcount!
-	 */
-	u_int32_t	refcount;
-	u_int32_t	olen;
-
-#define	VRFY_DUPS_UNSORTED	0x0001	/* Have to flag the negative! */
-#define	VRFY_HAS_DUPS		0x0002
-#define	VRFY_HAS_DUPSORT	0x0004	/* Has the flag set. */
-#define	VRFY_HAS_SUBDBS		0x0008
-#define	VRFY_HAS_RECNUMS	0x0010
-#define	VRFY_INCOMPLETE		0x0020	/* Meta or item order checks incomp. */
-#define	VRFY_IS_ALLZEROES	0x0040	/* Hash page we haven't touched? */
-#define	VRFY_IS_FIXEDLEN	0x0080
-#define	VRFY_IS_RECNO		0x0100
-#define	VRFY_IS_RRECNO		0x0200
-#define	VRFY_OVFL_LEAFSEEN	0x0400
-	u_int32_t	flags;
-
-	LIST_ENTRY(__vrfy_pageinfo) links;
-	u_int32_t	pi_refcount;
-}; /* VRFY_PAGEINFO */
-
-struct __vrfy_childinfo {
-	db_pgno_t	pgno;
-
-#define	V_DUPLICATE	1		/* off-page dup metadata */
-#define	V_OVERFLOW	2		/* overflow page */
-#define	V_RECNO		3		/* btree internal or leaf page */
-	u_int32_t	type;
-	db_recno_t	nrecs;		/* record count on a btree subtree */
-	u_int32_t	tlen;		/* ovfl. item total size */
-
-	LIST_ENTRY(__vrfy_childinfo) links;
-}; /* VRFY_CHILDINFO */
-
-#endif /* !_DB_VERIFY_H_ */
diff --git a/bdb/dbinc/debug.h b/bdb/dbinc/debug.h
deleted file mode 100644
index 21f80387ccc..00000000000
--- a/bdb/dbinc/debug.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1998-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: debug.h,v 11.31 2002/08/06 06:37:08 bostic Exp $
- */
-
-#ifndef _DB_DEBUG_H_
-#define	_DB_DEBUG_H_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- * When running with #DIAGNOSTIC defined, we smash memory and do memory
- * guarding with a special byte value.
- */
-#define	CLEAR_BYTE	0xdb
-#define	GUARD_BYTE	0xdc
-
-/*
- * DB assertions.
- */
-#if defined(DIAGNOSTIC) && defined(__STDC__)
-#define	DB_ASSERT(e)	((e) ? (void)0 : __db_assert(#e, __FILE__, __LINE__))
-#else
-#define	DB_ASSERT(e)
-#endif
-
-/*
- * Purify and other run-time tools complain about uninitialized reads/writes
- * of structure fields whose only purpose is padding, as well as when heap
- * memory that was never initialized is written to disk.
- */
-#ifdef	UMRW
-#define	UMRW_SET(v)	(v) = 0
-#else
-#define	UMRW_SET(v)
-#endif
-
-/*
- * Error message handling.  Use a macro instead of a function because va_list
- * references to variadic arguments cannot be reset to the beginning of the
- * variadic argument list (and then rescanned), by functions other than the
- * original routine that took the variadic list of arguments.
- */
-#if defined(__STDC__) || defined(__cplusplus)
-#define	DB_REAL_ERR(env, error, error_set, stderr_default, fmt) {	\
-	va_list ap;							\
-									\
-	/* Call the user's callback function, if specified. */		\
-	va_start(ap, fmt);						\
-	if ((env) != NULL && (env)->db_errcall != NULL)			\
-		__db_errcall(env, error, error_set, fmt, ap);		\
-	va_end(ap);							\
-									\
-	/* Write to the user's file descriptor, if specified. */	\
-	va_start(ap, fmt);						\
-	if ((env) != NULL && (env)->db_errfile != NULL)			\
-		__db_errfile(env, error, error_set, fmt, ap);		\
-	va_end(ap);							\
-									\
-	/*								\
-	 * If we have a default and we didn't do either of the above,	\
-	 * write to the default.					\
-	 */								\
-	va_start(ap, fmt);						\
-	if ((stderr_default) && ((env) == NULL ||			\
-	    ((env)->db_errcall == NULL && (env)->db_errfile == NULL)))	\
-		__db_errfile(env, error, error_set, fmt, ap);		\
-	va_end(ap);							\
-}
-#else
-#define	DB_REAL_ERR(env, error, error_set, stderr_default, fmt) {	\
-	va_list ap;							\
-									\
-	/* Call the user's callback function, if specified. */		\
-	va_start(ap);							\
-	if ((env) != NULL && (env)->db_errcall != NULL)			\
-		__db_errcall(env, error, error_set, fmt, ap);		\
-	va_end(ap);							\
-									\
-	/* Write to the user's file descriptor, if specified. */	\
-	va_start(ap);							\
-	if ((env) != NULL && (env)->db_errfile != NULL)			\
-		__db_errfile(env, error, error_set, fmt, ap);		\
-	va_end(ap);							\
-									\
-	/*								\
-	 * If we have a default and we didn't do either of the above,	\
-	 * write to the default.					\
-	 */								\
-	va_start(ap);							\
-	if ((stderr_default) && ((env) == NULL ||			\
-	    ((env)->db_errcall == NULL && (env)->db_errfile == NULL)))	\
-		__db_errfile(env, error, error_set, fmt, ap);		\
-	va_end(ap);							\
-}
-#endif
-
-/*
- * Debugging macro to log operations.
- *	If DEBUG_WOP is defined, log operations that modify the database.
- *	If DEBUG_ROP is defined, log operations that read the database.
- *
- * D dbp
- * T txn
- * O operation (string)
- * K key
- * A data
- * F flags
- */
-#define	LOG_OP(C, T, O, K, A, F) {					\
-	DB_LSN __lsn;							\
-	DBT __op;							\
-	if (DBC_LOGGING((C))) {						\
-		memset(&__op, 0, sizeof(__op));				\
-		__op.data = O;						\
-		__op.size = strlen(O) + 1;				\
-		(void)__db_debug_log((C)->dbp->dbenv, T, &__lsn, 0,	\
-		    &__op, (C)->dbp->log_filename->id, K, A, F);	\
-	}								\
-}
-#ifdef	DEBUG_ROP
-#define	DEBUG_LREAD(C, T, O, K, A, F)	LOG_OP(C, T, O, K, A, F)
-#else
-#define	DEBUG_LREAD(C, T, O, K, A, F)
-#endif
-#ifdef	DEBUG_WOP
-#define	DEBUG_LWRITE(C, T, O, K, A, F)	LOG_OP(C, T, O, K, A, F)
-#else
-#define	DEBUG_LWRITE(C, T, O, K, A, F)
-#endif
-
-/*
- * Hook for testing recovery at various places in the create/delete paths.
- * Hook for testing subdb locks.
- */
-#if CONFIG_TEST
-#define	DB_TEST_SUBLOCKS(env, flags)					\
-do {									\
-	if ((env)->test_abort == DB_TEST_SUBDB_LOCKS)			\
-		(flags) |= DB_LOCK_NOWAIT;				\
-} while (0)
-
-#define	DB_ENV_TEST_RECOVERY(env, val, ret, name)			\
-do {									\
-	int __ret;							\
-	PANIC_CHECK((env));						\
-	if ((env)->test_copy == (val)) {				\
-		/* COPY the FILE */					\
-		if ((__ret = __db_testcopy((env), NULL, (name))) != 0)	\
-			(ret) = __db_panic((env), __ret);		\
-	}								\
-	if ((env)->test_abort == (val)) {				\
-		/* ABORT the TXN */					\
-		(env)->test_abort = 0;					\
-		(ret) = EINVAL;						\
-		goto db_tr_err;						\
-	}								\
-} while (0)
-
-#define	DB_TEST_RECOVERY(dbp, val, ret, name)				\
-do {									\
-	int __ret;							\
-	PANIC_CHECK((dbp)->dbenv);					\
-	if ((dbp)->dbenv->test_copy == (val)) {				\
-		/* Copy the file. */					\
-		if (F_ISSET((dbp),					\
-		    DB_AM_OPEN_CALLED) && (dbp)->mpf != NULL)		\
-			(void)(dbp)->sync((dbp), 0);			\
-		if ((__ret =						\
-		    __db_testcopy((dbp)->dbenv, (dbp), (name))) != 0)	\
-			(ret) = __db_panic((dbp)->dbenv, __ret);	\
-	}								\
-	if ((dbp)->dbenv->test_abort == (val)) {			\
-		/* Abort the transaction. */				\
-		(dbp)->dbenv->test_abort = 0;				\
-		(ret) = EINVAL;						\
-		goto db_tr_err;						\
-	}								\
-} while (0)
-
-#define	DB_TEST_RECOVERY_LABEL	db_tr_err:
-#else
-#define	DB_TEST_SUBLOCKS(env, flags)
-#define	DB_ENV_TEST_RECOVERY(env, val, ret, name)
-#define	DB_TEST_RECOVERY(dbp, val, ret, name)
-#define	DB_TEST_RECOVERY_LABEL
-#endif
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_DB_DEBUG_H_ */
diff --git a/bdb/dbinc/fop.h b/bdb/dbinc/fop.h
deleted file mode 100644
index c438ef7ef40..00000000000
--- a/bdb/dbinc/fop.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: fop.h,v 11.3 2002/03/27 04:34:54 bostic Exp $
- */
-
-#ifndef	_FOP_H_
-#define	_FOP_H_
-
-#include "dbinc_auto/fileops_auto.h"
-#include "dbinc_auto/fileops_ext.h"
-
-#endif /* !_FOP_H_ */
diff --git a/bdb/dbinc/globals.h b/bdb/dbinc/globals.h
deleted file mode 100644
index 3441ade2ea9..00000000000
--- a/bdb/dbinc/globals.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: globals.h,v 11.1 2002/07/12 18:56:41 bostic Exp $
- */
-
-/*******************************************************
- * Global variables.
- *
- * Held in a single structure to minimize the name-space pollution.
- *******************************************************/
-#ifdef HAVE_VXWORKS
-#include "semLib.h"
-#endif
-
-typedef struct __db_globals {
-	u_int32_t no_write_errors;	/* write error testing disallowed */
-#ifdef HAVE_VXWORKS
-	u_int32_t db_global_init;	/* VxWorks: inited */
-	SEM_ID db_global_lock;		/* VxWorks: global semaphore */
-#endif
-					/* XA: list of opened environments. */
-	TAILQ_HEAD(__db_envq, __db_env) db_envq;
-
-	int	(*j_close) __P((int));	/* Underlying OS interface jump table.*/
-	void	(*j_dirfree) __P((char **, int));
-	int	(*j_dirlist) __P((const char *, char ***, int *));
-	int	(*j_exists) __P((const char *, int *));
-	void	(*j_free) __P((void *));
-	int	(*j_fsync) __P((int));
-	int	(*j_ioinfo) __P((const char *,
-		    int, u_int32_t *, u_int32_t *, u_int32_t *));
-	void   *(*j_malloc) __P((size_t));
-	int	(*j_map) __P((char *, size_t, int, int, void **));
-	int	(*j_open) __P((const char *, int, ...));
-	ssize_t	(*j_read) __P((int, void *, size_t));
-	void   *(*j_realloc) __P((void *, size_t));
-	int	(*j_rename) __P((const char *, const char *));
-	int	(*j_seek) __P((int, size_t, db_pgno_t, u_int32_t, int, int));
-	int	(*j_sleep) __P((u_long, u_long));
-	int	(*j_unlink) __P((const char *));
-	int	(*j_unmap) __P((void *, size_t));
-	ssize_t	(*j_write) __P((int, const void *, size_t));
-	int	(*j_yield) __P((void));
-} DB_GLOBALS;
-
-#ifdef DB_INITIALIZE_DB_GLOBALS
-DB_GLOBALS __db_global_values = {
-	0,				/* write error testing disallowed */
-#ifdef HAVE_VXWORKS
-	0,				/* VxWorks: initialized */
-	NULL,				/* VxWorks: global semaphore */
-#endif
-					/* XA: list of opened environments. */
-	{NULL, &__db_global_values.db_envq.tqh_first},
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-#else
-extern	DB_GLOBALS	__db_global_values;
-#endif
-
-#define	DB_GLOBAL(v)	__db_global_values.v
diff --git a/bdb/dbinc/hash.h b/bdb/dbinc/hash.h
deleted file mode 100644
index 98289735fc4..00000000000
--- a/bdb/dbinc/hash.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- */
-/*
- * Copyright (c) 1990, 1993, 1994
- *	Margo Seltzer.  All rights reserved.
- */
-/*
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Id: hash.h,v 11.26 2002/03/27 04:34:54 bostic Exp $
- */
-
-#ifndef	_DB_HASH_H_
-#define	_DB_HASH_H_
-
-/* Hash internal structure. */
-typedef struct hash_t {
-	db_pgno_t meta_pgno;	/* Page number of the meta data page. */
-	u_int32_t h_ffactor;	/* Fill factor. */
-	u_int32_t h_nelem;	/* Number of elements. */
-				/* Hash function. */
-	u_int32_t (*h_hash) __P((DB *, const void *, u_int32_t));
-} HASH;
-
-/* Cursor structure definitions. */
-typedef struct cursor_t {
-	/* struct __dbc_internal */
-	__DBC_INTERNAL
-
-	/* Hash private part */
-
-	/* Per-thread information */
-	DB_LOCK hlock;			/* Metadata page lock. */
-	HMETA *hdr;			/* Pointer to meta-data page. */
-	PAGE *split_buf;		/* Temporary buffer for splits. */
-
-	/* Hash cursor information */
-	db_pgno_t	bucket;		/* Bucket we are traversing. */
-	db_pgno_t	lbucket;	/* Bucket for which we are locked. */
-	db_indx_t	dup_off;	/* Offset within a duplicate set. */
-	db_indx_t	dup_len;	/* Length of current duplicate. */
-	db_indx_t	dup_tlen;	/* Total length of duplicate entry. */
-	u_int32_t	seek_size;	/* Number of bytes we need for add. */
-	db_pgno_t	seek_found_page;/* Page on which we can insert. */
-	u_int32_t	order;		/* Relative order among deleted curs. */
-
-#define	H_CONTINUE	0x0001		/* Join--search strictly fwd for data */
-#define	H_DELETED	0x0002		/* Cursor item is deleted. */
-#define	H_DIRTY		0x0004		/* Meta-data page needs to be written */
-#define	H_DUPONLY	0x0008		/* Dups only; do not change key. */
-#define	H_EXPAND	0x0010		/* Table expanded. */
-#define	H_ISDUP		0x0020		/* Cursor is within duplicate set. */
-#define	H_NEXT_NODUP	0x0040		/* Get next non-dup entry. */
-#define	H_NOMORE	0x0080		/* No more entries in bucket. */
-#define	H_OK		0x0100		/* Request succeeded. */
-	u_int32_t	flags;
-} HASH_CURSOR;
-
-/* Test string. */
-#define	CHARKEY			"%$sniglet^&"
-
-/* Overflow management */
-/*
- * The spares table indicates the page number at which each doubling begins.
- * From this page number we subtract the number of buckets already allocated
- * so that we can do a simple addition to calculate the page number here.
- */
-#define	BS_TO_PAGE(bucket, spares)		\
-	((bucket) + (spares)[__db_log2((bucket) + 1)])
-#define	BUCKET_TO_PAGE(I, B)	(BS_TO_PAGE((B), (I)->hdr->spares))
-
-/* Constraints about much data goes on a page. */
-
-#define	MINFILL		4
-#define	ISBIG(I, N)	(((N) > ((I)->hdr->dbmeta.pagesize / MINFILL)) ? 1 : 0)
-
-/* Shorthands for accessing structure */
-#define	NDX_INVALID	0xFFFF
-#define	BUCKET_INVALID	0xFFFFFFFF
-
-/* On page duplicates are stored as a string of size-data-size triples. */
-#define	DUP_SIZE(len)	((len) + 2 * sizeof(db_indx_t))
-
-/* Log messages types (these are subtypes within a record type) */
-#define	PAIR_KEYMASK		0x1
-#define	PAIR_DATAMASK		0x2
-#define	PAIR_DUPMASK		0x4
-#define	PAIR_MASK		0xf
-#define	PAIR_ISKEYBIG(N)	(N & PAIR_KEYMASK)
-#define	PAIR_ISDATABIG(N)	(N & PAIR_DATAMASK)
-#define	PAIR_ISDATADUP(N)	(N & PAIR_DUPMASK)
-#define	OPCODE_OF(N)	(N & ~PAIR_MASK)
-
-#define	PUTPAIR		0x20
-#define	DELPAIR		0x30
-#define	PUTOVFL		0x40
-#define	DELOVFL		0x50
-#define	HASH_UNUSED1	0x60
-#define	HASH_UNUSED2	0x70
-#define	SPLITOLD	0x80
-#define	SPLITNEW	0x90
-
-typedef enum {
-	DB_HAM_CHGPG = 1,
-	DB_HAM_DELFIRSTPG = 2,
-	DB_HAM_DELMIDPG = 3,
-	DB_HAM_DELLASTPG = 4,
-	DB_HAM_DUP   = 5,
-	DB_HAM_SPLIT = 6
-} db_ham_mode;
-
-#include "dbinc_auto/hash_auto.h"
-#include "dbinc_auto/hash_ext.h"
-#include "dbinc/db_am.h"
-#endif /* !_DB_HASH_H_ */
diff --git a/bdb/dbinc/hmac.h b/bdb/dbinc/hmac.h
deleted file mode 100644
index 16f61fb58ad..00000000000
--- a/bdb/dbinc/hmac.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: hmac.h,v 1.3 2002/08/06 06:37:08 bostic Exp $
- */
-
-#ifndef	_DB_HMAC_H_
-#define	_DB_HMAC_H_
-
-/*
- * Algorithm specific information.
- */
-/*
- * SHA1 checksumming
- */
-typedef struct {
-	u_int32_t	state[5];
-	u_int32_t	count[2];
-	unsigned char	buffer[64];
-} SHA1_CTX;
-
-/*
- * AES assumes the SHA1 checksumming (also called MAC)
- */
-#define	DB_MAC_MAGIC	"mac derivation key magic value"
-#define	DB_ENC_MAGIC	"encryption and decryption key value magic"
-
-#include "dbinc_auto/hmac_ext.h"
-#endif /* !_DB_HMAC_H_ */
diff --git a/bdb/dbinc/lock.h b/bdb/dbinc/lock.h
deleted file mode 100644
index 7ddc9ce9988..00000000000
--- a/bdb/dbinc/lock.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: lock.h,v 11.42 2002/05/18 01:34:13 bostic Exp $
- */
-
-#ifndef	_DB_LOCK_H_
-#define	_DB_LOCK_H_
-
-#define	DB_LOCK_DEFAULT_N	1000	/* Default # of locks in region. */
-
-/*
- * The locker id space is divided between the transaction manager and the lock
- * manager.  Lock IDs start at 1 and go to DB_LOCK_MAXID.  Txn IDs start at
- * DB_LOCK_MAXID + 1 and go up to TXN_MAXIMUM.
- */
-#define	DB_LOCK_INVALIDID	0
-#define	DB_LOCK_MAXID		0x7fffffff
-
-/*
- * Out of band value for a lock.  Locks contain an offset into a lock region,
- * so we use an invalid region offset to indicate an invalid or unset lock.
- */
-#define	LOCK_INVALID		INVALID_ROFF
-#define	LOCK_ISSET(lock)	((lock).off != LOCK_INVALID)
-#define	LOCK_INIT(lock)		((lock).off = LOCK_INVALID)
-
-/*
- * Macro to identify a write lock for the purpose of counting locks
- * for the NUMWRITES option to deadlock detection.
- */
-#define	IS_WRITELOCK(m) \
-	((m) == DB_LOCK_WRITE || (m) == DB_LOCK_IWRITE || (m) == DB_LOCK_IWR)
-
-/*
- * Lock timers.
- */
-typedef struct {
-	u_int32_t	tv_sec;		/* Seconds. */
-	u_int32_t	tv_usec;	/* Microseconds. */
-} db_timeval_t;
-
-#define	LOCK_TIME_ISVALID(time)		((time)->tv_sec != 0)
-#define	LOCK_SET_TIME_INVALID(time)	((time)->tv_sec = 0)
-#define	LOCK_TIME_EQUAL(t1, t2)						\
-	((t1)->tv_sec == (t2)->tv_sec && (t1)->tv_usec == (t2)->tv_usec)
-
-/*
- * DB_LOCKREGION --
- *	The lock shared region.
- */
-typedef struct __db_lockregion {
-	u_int32_t	need_dd;	/* flag for deadlock detector */
-	u_int32_t	detect;		/* run dd on every conflict */
-					/* free lock header */
-	SH_TAILQ_HEAD(__flock) free_locks;
-					/* free obj header */
-	SH_TAILQ_HEAD(__fobj) free_objs;
-					/* free locker header */
-	SH_TAILQ_HEAD(__flocker) free_lockers;
-	SH_TAILQ_HEAD(__dobj) dd_objs;	/* objects with waiters */
-	SH_TAILQ_HEAD(__lkrs) lockers;	/* list of lockers */
-
-	db_timeout_t	lk_timeout;	/* timeout for locks. */
-	db_timeout_t	tx_timeout;	/* timeout for txns. */
-
-	u_int32_t	locker_t_size;	/* size of locker hash table */
-	u_int32_t	object_t_size;	/* size of object hash table */
-
-	roff_t		conf_off;	/* offset of conflicts array */
-	roff_t		obj_off;	/* offset of object hash table */
-	roff_t		osynch_off;	/* offset of the object mutex table */
-	roff_t		locker_off;	/* offset of locker hash table */
-	roff_t		lsynch_off;	/* offset of the locker mutex table */
-
-	DB_LOCK_STAT	stat;		/* stats about locking. */
-
-#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
-	roff_t		maint_off;	/* offset of region maintenance info */
-#endif
-} DB_LOCKREGION;
-
-/*
- * Since we will store DBTs in shared memory, we need the equivalent of a
- * DBT that will work in shared memory.
- */
-typedef struct __sh_dbt {
-	u_int32_t size;			/* Byte length. */
-	ssize_t   off;			/* Region offset. */
-} SH_DBT;
-
-#define	SH_DBT_PTR(p)	((void *)(((u_int8_t *)(p)) + (p)->off))
-
-/*
- * Object structures;  these live in the object hash table.
- */
-typedef struct __db_lockobj {
-	SH_DBT	lockobj;		/* Identifies object locked. */
-	SH_TAILQ_ENTRY links;		/* Links for free list or hash list. */
-	SH_TAILQ_ENTRY dd_links;	/* Links for dd list. */
-	SH_TAILQ_HEAD(__wait) waiters;	/* List of waiting locks. */
-	SH_TAILQ_HEAD(__hold) holders;	/* List of held locks. */
-					/* Declare room in the object to hold
-					 * typical DB lock structures so that
-					 * we do not have to allocate them from
-					 * shalloc at run-time. */
-	u_int8_t objdata[sizeof(struct __db_ilock)];
-} DB_LOCKOBJ;
-
-/*
- * Locker structures; these live in the locker hash table.
- */
-typedef struct __db_locker {
-	u_int32_t id;			/* Locker id. */
-	u_int32_t dd_id;		/* Deadlock detector id. */
-	u_int32_t nlocks;		/* Number of locks held. */
-	u_int32_t nwrites;		/* Number of write locks held. */
-	size_t master_locker;		/* Locker of master transaction. */
-	size_t parent_locker;		/* Parent of this child. */
-	SH_LIST_HEAD(_child) child_locker;	/* List of descendant txns;
-						   only used in a "master"
-						   txn. */
-	SH_LIST_ENTRY child_link;	/* Links transactions in the family;
-					   elements of the child_locker
-					   list. */
-	SH_TAILQ_ENTRY links;		/* Links for free and hash list. */
-	SH_TAILQ_ENTRY ulinks;		/* Links in-use list. */
-	SH_LIST_HEAD(_held) heldby;	/* Locks held by this locker. */
-	db_timeval_t	lk_expire;	/* When current lock expires. */
-	db_timeval_t	tx_expire;	/* When this txn expires. */
-	db_timeout_t	lk_timeout;	/* How long do we let locks live. */
-
-#define	DB_LOCKER_DELETED	0x0001
-#define	DB_LOCKER_DIRTY		0x0002
-#define	DB_LOCKER_INABORT	0x0004
-#define	DB_LOCKER_TIMEOUT	0x0008
-	u_int32_t flags;
-} DB_LOCKER;
-
-/*
- * DB_LOCKTAB --
- *	The primary library lock data structure (i.e., the one referenced
- * by the environment, as opposed to the internal one laid out in the region.)
- */
-typedef struct __db_locktab {
-	DB_ENV		*dbenv;		/* Environment. */
-	REGINFO		 reginfo;	/* Region information. */
-	u_int8_t	*conflicts;	/* Pointer to conflict matrix. */
-	DB_HASHTAB	*obj_tab;	/* Beginning of object hash table. */
-	DB_HASHTAB	*locker_tab;	/* Beginning of locker hash table. */
-} DB_LOCKTAB;
-
-/* Test for conflicts. */
-#define	CONFLICTS(T, R, HELD, WANTED) \
-	(T)->conflicts[(HELD) * (R)->stat.st_nmodes + (WANTED)]
-
-#define	OBJ_LINKS_VALID(L) ((L)->links.stqe_prev != -1)
-
-struct __db_lock {
-	/*
-	 * Wait on mutex to wait on lock.  You reference your own mutex with
-	 * ID 0 and others reference your mutex with ID 1.
-	 */
-	DB_MUTEX	mutex;
-
-	u_int32_t	holder;		/* Who holds this lock. */
-	u_int32_t	gen;		/* Generation count. */
-	SH_TAILQ_ENTRY	links;		/* Free or holder/waiter list. */
-	SH_LIST_ENTRY	locker_links;	/* List of locks held by a locker. */
-	u_int32_t	refcount;	/* Reference count the lock. */
-	db_lockmode_t	mode;		/* What sort of lock. */
-	ssize_t		obj;		/* Relative offset of object struct. */
-	db_status_t	status;		/* Status of this lock. */
-};
-
-/*
- * Flag values for __lock_put_internal:
- * DB_LOCK_DOALL:     Unlock all references in this lock (instead of only 1).
- * DB_LOCK_FREE:      Free the lock (used in checklocker).
- * DB_LOCK_IGNOREDEL: Remove from the locker hash table even if already
-		      deleted (used in checklocker).
- * DB_LOCK_NOPROMOTE: Don't bother running promotion when releasing locks
- *		      (used by __lock_put_internal).
- * DB_LOCK_UNLINK:    Remove from the locker links (used in checklocker).
- * Make sure that these do not conflict with the interface flags because
- * we pass some of those around (i.e., DB_LOCK_REMOVE).
- */
-#define	DB_LOCK_DOALL		0x010000
-#define	DB_LOCK_FREE		0x020000
-#define	DB_LOCK_IGNOREDEL	0x040000
-#define	DB_LOCK_NOPROMOTE	0x080000
-#define	DB_LOCK_UNLINK		0x100000
-#define	DB_LOCK_NOWAITERS	0x200000
-
-/*
- * Macros to get/release different types of mutexes.
- */
-#define	OBJECT_LOCK(lt, reg, obj, ndx)					\
-	ndx = __lock_ohash(obj) % (reg)->object_t_size
-#define	SHOBJECT_LOCK(lt, reg, shobj, ndx)				\
-	ndx = __lock_lhash(shobj) % (reg)->object_t_size
-#define	LOCKER_LOCK(lt, reg, locker, ndx)				\
-	ndx = __lock_locker_hash(locker) % (reg)->locker_t_size;
-
-#define	LOCKREGION(dbenv, lt)  R_LOCK((dbenv), &(lt)->reginfo)
-#define	UNLOCKREGION(dbenv, lt)  R_UNLOCK((dbenv), &(lt)->reginfo)
-
-#include "dbinc_auto/lock_ext.h"
-#endif /* !_DB_LOCK_H_ */
diff --git a/bdb/dbinc/log.h b/bdb/dbinc/log.h
deleted file mode 100644
index 434994528ea..00000000000
--- a/bdb/dbinc/log.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: log.h,v 11.60 2002/08/06 06:37:08 bostic Exp $
- */
-
-#ifndef _LOG_H_
-#define	_LOG_H_
-
-struct __db_log;	typedef struct __db_log DB_LOG;
-struct __hdr;		typedef struct __hdr HDR;
-struct __log;		typedef struct __log LOG;
-struct __log_persist;	typedef struct __log_persist LOGP;
-
-#define	LFPREFIX	"log."		/* Log file name prefix. */
-#define	LFNAME		"log.%010d"	/* Log file name template. */
-#define	LFNAME_V1	"log.%05d"	/* Log file name template, rev 1. */
-
-#define	LG_MAX_DEFAULT		(10 * MEGABYTE)	/* 10 MB. */
-#define	LG_BSIZE_DEFAULT	(32 * 1024)	/* 32 KB. */
-#define	LG_BASE_REGION_SIZE	(60 * 1024)	/* 60 KB. */
-
-/*
- * The per-process table that maps log file-id's to DB structures.
- */
-typedef	struct __db_entry {
-	DB	*dbp;			/* Open dbp for this file id. */
-	int	deleted;		/* File was not found during open. */
-} DB_ENTRY;
-
-/*
- * DB_LOG
- *	Per-process log structure.
- */
-struct __db_log {
-/*
- * These fields need to be protected for multi-threaded support.
- *
- * !!!
- * As this structure is allocated in per-process memory, the mutex may need
- * to be stored elsewhere on architectures unable to support mutexes in heap
- * memory, e.g., HP/UX 9.
- */
-	DB_MUTEX  *mutexp;		/* Mutex for thread protection. */
-
-	DB_ENTRY *dbentry;		/* Recovery file-id mapping. */
-#define	DB_GROW_SIZE	64
-	int32_t dbentry_cnt;		/* Entries.  Grows by DB_GROW_SIZE. */
-
-/*
- * These fields are always accessed while the region lock is held, so they do
- * not have to be protected by the thread lock as well, OR, they are only used
- * when threads are not being used, i.e. most cursor operations are disallowed
- * on threaded logs.
- */
-	u_int32_t lfname;		/* Log file "name". */
-	DB_FH	  lfh;			/* Log file handle. */
-
-	u_int8_t *bufp;			/* Region buffer. */
-
-/* These fields are not protected. */
-	DB_ENV	 *dbenv;		/* Reference to error information. */
-	REGINFO	  reginfo;		/* Region information. */
-
-#define	DBLOG_RECOVER		0x01	/* We are in recovery. */
-#define	DBLOG_FORCE_OPEN	0x02	/* Force the DB open even if it appears
-					 * to be deleted.
-					 */
-	u_int32_t flags;
-};
-
-/*
- * HDR --
- *	Log record header.
- */
-struct __hdr {
-	u_int32_t prev;			/* Previous offset. */
-	u_int32_t len;			/* Current length. */
-	u_int8_t  chksum[DB_MAC_KEY];	/* Current checksum. */
-	u_int8_t  iv[DB_IV_BYTES];	/* IV */
-	u_int32_t orig_size;		/* Original size of log record */
-	/* !!! - 'size' is not written to log, must be last in hdr */
-	size_t	  size;			/* Size of header to use */
-};
-
-/*
- * We use HDR internally, and then when we write out, we write out
- * prev, len, and then a 4-byte checksum if normal operation or
- * a crypto-checksum and IV and original size if running in crypto
- * mode.  We must store the original size in case we pad.  Set the
- * size when we set up the header.  We compute a DB_MAC_KEY size
- * checksum regardless, but we can safely just use the first 4 bytes.
- */
-#define	HDR_NORMAL_SZ	12
-#define	HDR_CRYPTO_SZ	12 + DB_MAC_KEY + DB_IV_BYTES
-
-struct __log_persist {
-	u_int32_t magic;		/* DB_LOGMAGIC */
-	u_int32_t version;		/* DB_LOGVERSION */
-
-	u_int32_t log_size;		/* Log file size. */
-	u_int32_t mode;			/* Log file mode. */
-};
-
-/*
- * LOG --
- *	Shared log region.  One of these is allocated in shared memory,
- *	and describes the log.
- */
-struct __log {
-	/*
-	 * Due to alignment constraints on some architectures (e.g. HP-UX),
-	 * DB_MUTEXes must be the first element of shalloced structures,
-	 * and as a corollary there can be only one per structure.  Thus,
-	 * flush_mutex_off points to a mutex in a separately-allocated chunk.
-	 */
-	DB_MUTEX fq_mutex;		/* Mutex guarding file name list. */
-
-	LOGP	 persist;		/* Persistent information. */
-
-	SH_TAILQ_HEAD(__fq1) fq;	/* List of file names. */
-	int32_t	fid_max;		/* Max fid allocated. */
-	roff_t	free_fid_stack;		/* Stack of free file ids. */
-	int	free_fids;		/* Height of free fid stack. */
-	int	free_fids_alloced;	/* Number of free fid slots alloc'ed. */
-
-	/*
-	 * The lsn LSN is the file offset that we're about to write and which
-	 * we will return to the user.
-	 */
-	DB_LSN	  lsn;			/* LSN at current file offset. */
-
-	/*
-	 * The f_lsn LSN is the LSN (returned to the user) that "owns" the
-	 * first byte of the buffer.  If the record associated with the LSN
-	 * spans buffers, it may not reflect the physical file location of
-	 * the first byte of the buffer.
-	 */
-	DB_LSN	  f_lsn;		/* LSN of first byte in the buffer. */
-	size_t	  b_off;		/* Current offset in the buffer. */
-	u_int32_t w_off;		/* Current write offset in the file. */
-	u_int32_t len;			/* Length of the last record. */
-
-	/*
-	 * The s_lsn LSN is the last LSN that we know is on disk, not just
-	 * written, but synced.  This field is protected by the flush mutex
-	 * rather than by the region mutex.
-	 */
-	int	  in_flush;		/* Log flush in progress. */
-	roff_t	  flush_mutex_off;	/* Mutex guarding flushing. */
-	DB_LSN	  s_lsn;		/* LSN of the last sync. */
-
-	DB_LOG_STAT stat;		/* Log statistics. */
-
-	/*
-	 * The waiting_lsn is used by the replication system.  It is the
-	 * first LSN that we are holding without putting in the log, because
-	 * we received one or more log records out of order.  Associated with
-	 * the waiting_lsn is the number of log records that we still have to
-	 * receive before we decide that we should request it again.
-	 */
-	DB_LSN	  waiting_lsn;		/* First log record after a gap. */
-	DB_LSN	  verify_lsn;		/* LSN we are waiting to verify. */
-	u_int32_t wait_recs;		/* Records to wait before requesting. */
-	u_int32_t rcvd_recs;		/* Records received while waiting. */
-
-	/*
-	 * The ready_lsn is also used by the replication system.  It is the
-	 * next LSN we expect to receive.  It's normally equal to "lsn",
-	 * except at the beginning of a log file, at which point it's set
-	 * to the LSN of the first record of the new file (after the
-	 * header), rather than to 0.
-	 */
-	DB_LSN	  ready_lsn;
-
-	/*
-	 * During initialization, the log system walks forward through the
-	 * last log file to find its end.  If it runs into a checkpoint
-	 * while it's doing so, it caches it here so that the transaction
-	 * system doesn't need to walk through the file again on its
-	 * initialization.
-	 */
-	DB_LSN	cached_ckp_lsn;
-
-	roff_t	  buffer_off;		/* Log buffer offset in the region. */
-	u_int32_t buffer_size;		/* Log buffer size. */
-
-	u_int32_t log_size;		/* Log file's size. */
-	u_int32_t log_nsize;		/* Next log file's size. */
-
-	u_int32_t ncommit;		/* Number of txns waiting to commit. */
-
-	DB_LSN	  t_lsn;		/* LSN of first commit */
-	SH_TAILQ_HEAD(__commit) commits;/* list of txns waiting to commit. */
-	SH_TAILQ_HEAD(__free) free_commits;/* free list of commit structs. */
-
-#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
-#define	LG_MAINT_SIZE	(sizeof(roff_t) * DB_MAX_HANDLES)
-
-	roff_t	  maint_off;		/* offset of region maintenance info */
-#endif
-};
-
-/*
- * __db_commit structure --
- *	One of these is allocated for each transaction waiting
- * to commit.
- */
-struct __db_commit {
-	DB_MUTEX	mutex;		/* Mutex for txn to wait on. */
-	DB_LSN		lsn;		/* LSN of commit record. */
-	SH_TAILQ_ENTRY	links;		/* Either on free or waiting list. */
-
-#define	DB_COMMIT_FLUSH		0x0001	/* Flush the log when you wake up. */
-	u_int32_t	flags;
-};
-
-/*
- * FNAME --
- *	File name and id.
- */
-struct __fname {
-	SH_TAILQ_ENTRY q;		/* File name queue. */
-
-	int32_t id;			/* Logging file id. */
-	DBTYPE	  s_type;		/* Saved DB type. */
-
-	roff_t	  name_off;		/* Name offset. */
-	db_pgno_t meta_pgno;		/* Page number of the meta page. */
-	u_int8_t  ufid[DB_FILE_ID_LEN];	/* Unique file id. */
-
-	u_int32_t create_txnid;		/*
-					 * Txn ID of the DB create, stored so
-					 * we can log it at register time.
-					 */
-};
-
-/* File open/close register log record opcodes. */
-#define	LOG_CHECKPOINT	1		/* Checkpoint: file name/id dump. */
-#define	LOG_CLOSE	2		/* File close. */
-#define	LOG_OPEN	3		/* File open. */
-#define	LOG_RCLOSE	4		/* File close after recovery. */
-
-#define	CHECK_LSN(redo, cmp, lsn, prev)					\
-	DB_ASSERT(!DB_REDO(redo) ||					\
-	    (cmp) >= 0 || IS_NOT_LOGGED_LSN(*lsn));			\
-	if (DB_REDO(redo) && (cmp) < 0 && !IS_NOT_LOGGED_LSN(*(lsn))) {	\
-		__db_err(dbenv,						\
-	"Log sequence error: page LSN %lu %lu; previous LSN %lu %lu",	\
-		    (u_long)(lsn)->file, (u_long)(lsn)->offset,		\
-		    (u_long)(prev)->file, (u_long)(prev)->offset);	\
-		goto out;						\
-	}
-
-/*
- * Status codes indicating the validity of a log file examined by
- * __log_valid().
- */
-typedef enum {
-	DB_LV_INCOMPLETE,
-	DB_LV_NONEXISTENT,
-	DB_LV_NORMAL,
-	DB_LV_OLD_READABLE,
-	DB_LV_OLD_UNREADABLE
-} logfile_validity;
-
-#include "dbinc_auto/dbreg_auto.h"
-#include "dbinc_auto/dbreg_ext.h"
-#include "dbinc_auto/log_ext.h"
-#endif /* !_LOG_H_ */
diff --git a/bdb/dbinc/mp.h b/bdb/dbinc/mp.h
deleted file mode 100644
index 5c805b92364..00000000000
--- a/bdb/dbinc/mp.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: mp.h,v 11.44 2002/08/06 06:11:21 bostic Exp $
- */
-
-#ifndef	_DB_MP_H_
-#define	_DB_MP_H_
-
-struct __bh;		typedef struct __bh BH;
-struct __db_mpool_hash; typedef struct __db_mpool_hash DB_MPOOL_HASH;
-struct __db_mpreg;	typedef struct __db_mpreg DB_MPREG;
-struct __mpool;		typedef struct __mpool MPOOL;
-
-				/* We require at least 20KB of cache. */
-#define	DB_CACHESIZE_MIN	(20 * 1024)
-
-typedef enum {
-	DB_SYNC_ALLOC,		/* Flush for allocation. */
-	DB_SYNC_CACHE,		/* Checkpoint or flush entire cache. */
-	DB_SYNC_FILE,		/* Flush file. */
-	DB_SYNC_TRICKLE		/* Trickle sync. */
-} db_sync_op;
-
-/*
- * DB_MPOOL --
- *	Per-process memory pool structure.
- */
-struct __db_mpool {
-	/* These fields need to be protected for multi-threaded support. */
-	DB_MUTEX   *mutexp;		/* Structure thread lock. */
-
-					/* List of pgin/pgout routines. */
-	LIST_HEAD(__db_mpregh, __db_mpreg) dbregq;
-
-					/* List of DB_MPOOLFILE's. */
-	TAILQ_HEAD(__db_mpoolfileh, __db_mpoolfile) dbmfq;
-
-	/*
-	 * The dbenv, nreg and reginfo fields are not thread protected,
-	 * as they are initialized during mpool creation, and not modified
-	 * again.
-	 */
-	DB_ENV	   *dbenv;		/* Enclosing environment. */
-
-	u_int32_t   nreg;		/* N underlying cache regions. */
-	REGINFO	   *reginfo;		/* Underlying cache regions. */
-};
-
-/*
- * DB_MPREG --
- *	DB_MPOOL registry of pgin/pgout functions.
- */
-struct __db_mpreg {
-	LIST_ENTRY(__db_mpreg) q;	/* Linked list. */
-
-	int32_t ftype;			/* File type. */
-					/* Pgin, pgout routines. */
-	int (*pgin) __P((DB_ENV *, db_pgno_t, void *, DBT *));
-	int (*pgout) __P((DB_ENV *, db_pgno_t, void *, DBT *));
-};
-
-/*
- * NCACHE --
- *	Select a cache based on the file and the page number.  Assumes accesses
- *	are uniform across pages, which is probably OK.  What we really want to
- *	avoid is anything that puts all pages from any single file in the same
- *	cache, as we expect that file access will be bursty, and to avoid
- *	putting all page number N pages in the same cache as we expect access
- *	to the metapages (page 0) and the root of a btree (page 1) to be much
- *	more frequent than a random data page.
- */
-#define	NCACHE(mp, mf_offset, pgno)					\
-	(((pgno) ^ ((mf_offset) >> 3)) % ((MPOOL *)mp)->nreg)
-
-/*
- * NBUCKET --
- *	 We make the assumption that early pages of the file are more likely
- *	 to be retrieved than the later pages, which means the top bits will
- *	 be more interesting for hashing as they're less likely to collide.
- *	 That said, as 512 8K pages represents a 4MB file, so only reasonably
- *	 large files will have page numbers with any other than the bottom 9
- *	 bits set.  We XOR in the MPOOL offset of the MPOOLFILE that backs the
- *	 page, since that should also be unique for the page.  We don't want
- *	 to do anything very fancy -- speed is more important to us than using
- *	 good hashing.
- */
-#define	NBUCKET(mc, mf_offset, pgno)					\
-	(((pgno) ^ ((mf_offset) << 9)) % (mc)->htab_buckets)
-
-/*
- * MPOOL --
- *	Shared memory pool region.
- */
-struct __mpool {
-	/*
-	 * The memory pool can be broken up into individual pieces/files.
-	 * Not what we would have liked, but on Solaris you can allocate
-	 * only a little more than 2GB of memory in a contiguous chunk,
-	 * and I expect to see more systems with similar issues.
-	 *
-	 * While this structure is duplicated in each piece of the cache,
-	 * the first of these pieces/files describes the entire pool, the
-	 * second only describe a piece of the cache.
-	 */
-
-	/*
-	 * The lsn field and list of underlying MPOOLFILEs are thread protected
-	 * by the region lock.
-	 */
-	DB_LSN	  lsn;			/* Maximum checkpoint LSN. */
-
-	SH_TAILQ_HEAD(__mpfq) mpfq;	/* List of MPOOLFILEs. */
-
-	/*
-	 * The nreg, regids and maint_off fields are not thread protected,
-	 * as they are initialized during mpool creation, and not modified
-	 * again.
-	 */
-	u_int32_t nreg;			/* Number of underlying REGIONS. */
-	roff_t	  regids;		/* Array of underlying REGION Ids. */
-
-#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
-	roff_t	    maint_off;		/* Maintenance information offset */
-#endif
-
-	/*
-	 * The following structure fields only describe the per-cache portion
-	 * of the region.
-	 *
-	 * The htab and htab_buckets fields are not thread protected as they
-	 * are initialized during mpool creation, and not modified again.
-	 *
-	 * The last_checked and lru_count fields are thread protected by
-	 * the region lock.
-	 */
-	int	    htab_buckets;	/* Number of hash table entries. */
-	roff_t	    htab;		/* Hash table offset. */
-	u_int32_t   last_checked;	/* Last bucket checked for free. */
-	u_int32_t   lru_count;		/* Counter for buffer LRU */
-
-	/*
-	 * The stat fields are generally not thread protected, and cannot be
-	 * trusted.  Note that st_pages is an exception, and is always updated
-	 * inside a region lock (although it is sometimes read outside of the
-	 * region lock).
-	 */
-	DB_MPOOL_STAT stat;		/* Per-cache mpool statistics. */
-};
-
-struct __db_mpool_hash {
-	DB_MUTEX	hash_mutex;	/* Per-bucket mutex. */
-
-	DB_HASHTAB	hash_bucket;	/* Head of bucket. */
-
-	u_int32_t	hash_page_dirty;/* Count of dirty pages. */
-	u_int32_t	hash_priority;	/* Minimum priority of bucket buffer. */
-};
-
-/*
- * The base mpool priority is 1/4th of the name space, or just under 2^30.
- * When the LRU counter wraps, we shift everybody down to a base-relative
- * value.
- */
-#define	MPOOL_BASE_DECREMENT	(UINT32_T_MAX - (UINT32_T_MAX / 4))
-
-/*
- * Mpool priorities from low to high.  Defined in terms of fractions of the
- * buffers in the pool.
- */
-#define	MPOOL_PRI_VERY_LOW	-1	/* Dead duck.  Check and set to 0. */
-#define	MPOOL_PRI_LOW		-2	/* Low. */
-#define	MPOOL_PRI_DEFAULT	0	/* No adjustment -- special case.*/
-#define	MPOOL_PRI_HIGH		10	/* With the dirty buffers. */
-#define	MPOOL_PRI_DIRTY		10	/* Dirty gets a 10% boost. */
-#define	MPOOL_PRI_VERY_HIGH	1	/* Add number of buffers in pool. */
-
-/*
- * MPOOLFILE_IGNORE --
- *	Discard an MPOOLFILE and any buffers it references: update the flags
- *	so we never try to write buffers associated with the file, nor can we
- *	find it when looking for files to join.  In addition, clear the ftype
- *	field, there's no reason to post-process pages, they can be discarded
- *	by any thread.
- *
- * Expects the MPOOLFILE mutex to be held.
- */
-#define	MPOOLFILE_IGNORE(mfp) {						\
-	(mfp)->ftype = 0;						\
-	F_SET(mfp, MP_DEADFILE);					\
-}
-
-/*
- * MPOOLFILE --
- *	Shared DB_MPOOLFILE information.
- */
-struct __mpoolfile {
-	DB_MUTEX mutex;
-
-	/* Protected by MPOOLFILE mutex. */
-	u_int32_t mpf_cnt;		/* Ref count: DB_MPOOLFILEs. */
-	u_int32_t block_cnt;		/* Ref count: blocks in cache. */
-
-	roff_t	  path_off;		/* File name location. */
-
-	/* Protected by mpool cache 0 region lock. */
-	SH_TAILQ_ENTRY q;		/* List of MPOOLFILEs */
-	db_pgno_t last_pgno;		/* Last page in the file. */
-	db_pgno_t orig_last_pgno;	/* Original last page in the file. */
-
-	/*
-	 * None of the following fields are thread protected.
-	 *
-	 * There are potential races with the ftype field because it's read
-	 * without holding a lock.  However, it has to be set before adding
-	 * any buffers to the cache that depend on it being set, so there
-	 * would need to be incorrect operation ordering to have a problem.
-	 *
-	 * There are potential races with the priority field because it's read
-	 * without holding a lock.  However, a collision is unlikely and if it
-	 * happens is of little consequence.
-	 *
-	 * We do not protect the statistics in "stat" because of the cost of
-	 * the mutex in the get/put routines.  There is a chance that a count
-	 * will get lost.
-	 *
-	 * The remaining fields are initialized at open and never subsequently
-	 * modified, except for the MP_DEADFILE, which is only set and never
-	 * unset.  (If there was more than one flag that was subsequently set,
-	 * there might be a race, but with a single flag there can't be.)
-	 */
-	int32_t	  ftype;		/* File type. */
-
-	int32_t   priority;		/* Priority when unpinning buffer. */
-
-	DB_MPOOL_FSTAT stat;		/* Per-file mpool statistics. */
-
-	int32_t	  lsn_off;		/* Page's LSN offset. */
-	u_int32_t clear_len;		/* Bytes to clear on page create. */
-
-	roff_t	  fileid_off;		/* File ID string location. */
-
-	roff_t	  pgcookie_len;		/* Pgin/pgout cookie length. */
-	roff_t	  pgcookie_off;		/* Pgin/pgout cookie location. */
-
-#define	MP_CAN_MMAP	0x01		/* If the file can be mmap'd. */
-#define	MP_DEADFILE	0x02		/* Dirty pages can simply be trashed. */
-#define	MP_DIRECT	0x04		/* No OS buffering. */
-#define	MP_EXTENT	0x08		/* Extent file. */
-#define	MP_TEMP		0x10		/* Backing file is a temporary. */
-#define	MP_UNLINK	0x20		/* Unlink file on last close. */
-	u_int32_t  flags;
-};
-
-/*
- * BH --
- *	Buffer header.
- */
-struct __bh {
-	DB_MUTEX	mutex;		/* Buffer thread/process lock. */
-
-	u_int16_t	ref;		/* Reference count. */
-	u_int16_t	ref_sync;	/* Sync wait-for reference count. */
-
-#define	BH_CALLPGIN	0x001		/* Convert the page before use. */
-#define	BH_DIRTY	0x002		/* Page was modified. */
-#define	BH_DIRTY_CREATE	0x004		/* Page created, must be written. */
-#define	BH_DISCARD	0x008		/* Page is useless. */
-#define	BH_LOCKED	0x010		/* Page is locked (I/O in progress). */
-#define	BH_TRASH	0x020		/* Page is garbage. */
-	u_int16_t	flags;
-
-	u_int32_t	priority;	/* LRU priority. */
-	SH_TAILQ_ENTRY	hq;		/* MPOOL hash bucket queue. */
-
-	db_pgno_t pgno;			/* Underlying MPOOLFILE page number. */
-	roff_t	  mf_offset;		/* Associated MPOOLFILE offset. */
-
-	/*
-	 * !!!
-	 * This array must be at least size_t aligned -- the DB access methods
-	 * put PAGE and other structures into it, and then access them directly.
-	 * (We guarantee size_t alignment to applications in the documentation,
-	 * too.)
-	 */
-	u_int8_t   buf[1];		/* Variable length data. */
-};
-
-#include "dbinc_auto/mp_ext.h"
-#endif /* !_DB_MP_H_ */
diff --git a/bdb/dbinc/mutex.h b/bdb/dbinc/mutex.h
deleted file mode 100644
index 41bb1b4bb59..00000000000
--- a/bdb/dbinc/mutex.h
+++ /dev/null
@@ -1,879 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: mutex.h,v 11.71 2002/09/10 01:36:48 bostic Exp $
- */
-
-#ifndef _DB_MUTEX_H_
-#define	_DB_MUTEX_H_
-
-/*
- * Some of the Berkeley DB ports require single-threading at various
- * places in the code.  In those cases, these #defines will be set.
- */
-#define	DB_BEGIN_SINGLE_THREAD
-#define	DB_END_SINGLE_THREAD
-
-/*********************************************************************
- * POSIX.1 pthreads interface.
- *********************************************************************/
-#ifdef HAVE_MUTEX_PTHREADS
-#include <pthread.h>
-
-#define	MUTEX_FIELDS							\
-	pthread_mutex_t mutex;		/* Mutex. */			\
-	pthread_cond_t  cond;		/* Condition variable. */
-#endif
-
-/*********************************************************************
- * Solaris lwp threads interface.
- *
- * !!!
- * We use LWP mutexes on Solaris instead of UI or POSIX mutexes (both of
- * which are available), for two reasons.  First, the Solaris C library
- * includes versions of the both UI and POSIX thread mutex interfaces, but
- * they are broken in that they don't support inter-process locking, and
- * there's no way to detect it, e.g., calls to configure the mutexes for
- * inter-process locking succeed without error.  So, we use LWP mutexes so
- * that we don't fail in fairly undetectable ways because the application
- * wasn't linked with the appropriate threads library.  Second, there were
- * bugs in SunOS 5.7 (Solaris 7) where if an application loaded the C library
- * before loading the libthread/libpthread threads libraries (e.g., by using
- * dlopen to load the DB library), the pwrite64 interface would be translated
- * into a call to pwrite and DB would drop core.
- *********************************************************************/
-#ifdef HAVE_MUTEX_SOLARIS_LWP
-/*
- * XXX
- * Don't change <synch.h> to <sys/lwp.h> -- although lwp.h is listed in the
- * Solaris manual page as the correct include to use, it causes the Solaris
- * compiler on SunOS 2.6 to fail.
- */
-#include <synch.h>
-
-#define	MUTEX_FIELDS							\
-	lwp_mutex_t mutex;		/* Mutex. */			\
-	lwp_cond_t cond;		/* Condition variable. */
-#endif
-
-/*********************************************************************
- * Solaris/Unixware threads interface.
- *********************************************************************/
-#ifdef HAVE_MUTEX_UI_THREADS
-#include <thread.h>
-#include <synch.h>
-
-#define	MUTEX_FIELDS							\
-	mutex_t mutex;			/* Mutex. */			\
-	cond_t  cond;			/* Condition variable. */
-#endif
-
-/*********************************************************************
- * AIX C library functions.
- *********************************************************************/
-#ifdef HAVE_MUTEX_AIX_CHECK_LOCK
-#include <sys/atomic_op.h>
-typedef int tsl_t;
-#define	MUTEX_ALIGN	sizeof(int)
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-#define	MUTEX_INIT(x)	0
-#define	MUTEX_SET(x)	(!_check_lock(x, 0, 1))
-#define	MUTEX_UNSET(x)	_clear_lock(x, 0)
-#endif
-#endif
-
-/*********************************************************************
- * General C library functions (msemaphore).
- *
- * !!!
- * Check for HPPA as a special case, because it requires unusual alignment,
- * and doesn't support semaphores in malloc(3) or shmget(2) memory.
- *
- * !!!
- * Do not remove the MSEM_IF_NOWAIT flag.  The problem is that if a single
- * process makes two msem_lock() calls in a row, the second one returns an
- * error.  We depend on the fact that we can lock against ourselves in the
- * locking subsystem, where we set up a mutex so that we can block ourselves.
- * Tested on OSF1 v4.0.
- *********************************************************************/
-#ifdef HAVE_MUTEX_HPPA_MSEM_INIT
-#define	MUTEX_NO_MALLOC_LOCKS
-#define	MUTEX_NO_SHMGET_LOCKS
-
-#define	MUTEX_ALIGN	16
-#endif
-
-#if defined(HAVE_MUTEX_MSEM_INIT) || defined(HAVE_MUTEX_HPPA_MSEM_INIT)
-#include <sys/mman.h>
-typedef msemaphore tsl_t;
-
-#ifndef MUTEX_ALIGN
-#define	MUTEX_ALIGN	sizeof(int)
-#endif
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-#define	MUTEX_INIT(x)	(msem_init(x, MSEM_UNLOCKED) <= (msemaphore *)0)
-#define	MUTEX_SET(x)	(!msem_lock(x, MSEM_IF_NOWAIT))
-#define	MUTEX_UNSET(x)	msem_unlock(x, 0)
-#endif
-#endif
-
-/*********************************************************************
- * Plan 9 library functions.
- *********************************************************************/
-#ifdef HAVE_MUTEX_PLAN9
-typedef Lock tsl_t;
-
-#define	MUTEX_ALIGN	sizeof(int)
-
-#define	MUTEX_INIT(x)	(memset(x, 0, sizeof(Lock)), 0)
-#define	MUTEX_SET(x)	canlock(x)
-#define	MUTEX_UNSET(x)	unlock(x)
-#endif
-
-/*********************************************************************
- * Reliant UNIX C library functions.
- *********************************************************************/
-#ifdef HAVE_MUTEX_RELIANTUNIX_INITSPIN
-#include <ulocks.h>
-typedef spinlock_t tsl_t;
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-#define	MUTEX_INIT(x)	(initspin(x, 1), 0)
-#define	MUTEX_SET(x)	(cspinlock(x) == 0)
-#define	MUTEX_UNSET(x)	spinunlock(x)
-#endif
-#endif
-
-/*********************************************************************
- * General C library functions (POSIX 1003.1 sema_XXX).
- *
- * !!!
- * Never selected by autoconfig in this release (semaphore calls are known
- * to not work in Solaris 5.5).
- *********************************************************************/
-#ifdef HAVE_MUTEX_SEMA_INIT
-#include <synch.h>
-typedef sema_t tsl_t;
-#define	MUTEX_ALIGN	 sizeof(int)
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-#define	MUTEX_DESTROY(x) sema_destroy(x)
-#define	MUTEX_INIT(x)	 (sema_init(x, 1, USYNC_PROCESS, NULL) != 0)
-#define	MUTEX_SET(x)	 (sema_wait(x) == 0)
-#define	MUTEX_UNSET(x)	 sema_post(x)
-#endif
-#endif
-
-/*********************************************************************
- * SGI C library functions.
- *********************************************************************/
-#ifdef HAVE_MUTEX_SGI_INIT_LOCK
-#include <abi_mutex.h>
-typedef abilock_t tsl_t;
-#define	MUTEX_ALIGN	sizeof(int)
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-#define	MUTEX_INIT(x)	(init_lock(x) != 0)
-#define	MUTEX_SET(x)	(!acquire_lock(x))
-#define	MUTEX_UNSET(x)	release_lock(x)
-#endif
-#endif
-
-/*********************************************************************
- * Solaris C library functions.
- *
- * !!!
- * These are undocumented functions, but they're the only ones that work
- * correctly as far as we know.
- *********************************************************************/
-#ifdef HAVE_MUTEX_SOLARIS_LOCK_TRY
-#include <sys/machlock.h>
-typedef lock_t tsl_t;
-#define	MUTEX_ALIGN	sizeof(int)
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-#define	MUTEX_INIT(x)	0
-#define	MUTEX_SET(x)	_lock_try(x)
-#define	MUTEX_UNSET(x)	_lock_clear(x)
-#endif
-#endif
-
-/*********************************************************************
- * VMS.
- *********************************************************************/
-#ifdef HAVE_MUTEX_VMS
-#include <sys/mman.h>;
-#include <builtins.h>
-typedef unsigned char tsl_t;
-#define	MUTEX_ALIGN		sizeof(unsigned int)
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-#ifdef __ALPHA
-#define	MUTEX_SET(tsl)		(!__TESTBITSSI(tsl, 0))
-#else /* __VAX */
-#define	MUTEX_SET(tsl)		(!(int)_BBSSI(0, tsl))
-#endif
-#define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-#define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-#endif
-#endif
-
-/*********************************************************************
- * VxWorks
- * Use basic binary semaphores in VxWorks, as we currently do not need
- * any special features.  We do need the ability to single-thread the
- * entire system, however, because VxWorks doesn't support the open(2)
- * flag O_EXCL, the mechanism we normally use to single thread access
- * when we're first looking for a DB environment.
- *********************************************************************/
-#ifdef HAVE_MUTEX_VXWORKS
-#include "taskLib.h"
-typedef SEM_ID tsl_t;
-#define	MUTEX_ALIGN		sizeof(unsigned int)
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-#define	MUTEX_SET(tsl)		(semTake((*tsl), WAIT_FOREVER) == OK)
-#define	MUTEX_UNSET(tsl)	(semGive((*tsl)))
-#define	MUTEX_INIT(tsl)							\
-	((*(tsl) = semBCreate(SEM_Q_FIFO, SEM_FULL)) == NULL)
-#define	MUTEX_DESTROY(tsl)	semDelete(*tsl)
-#endif
-
-/*
- * Use the taskLock() mutex to eliminate a race where two tasks are
- * trying to initialize the global lock at the same time.
- */
-#undef	DB_BEGIN_SINGLE_THREAD
-#define	DB_BEGIN_SINGLE_THREAD						\
-do {									\
-	if (DB_GLOBAL(db_global_init))					\
-		(void)semTake(DB_GLOBAL(db_global_lock), WAIT_FOREVER);	\
-	else {								\
-		taskLock();						\
-		if (DB_GLOBAL(db_global_init)) {			\
-			taskUnlock();					\
-			(void)semTake(DB_GLOBAL(db_global_lock),	\
-			    WAIT_FOREVER);				\
-			continue;					\
-		}							\
-		DB_GLOBAL(db_global_lock) =				\
-		    semBCreate(SEM_Q_FIFO, SEM_EMPTY);			\
-		if (DB_GLOBAL(db_global_lock) != NULL)			\
-			DB_GLOBAL(db_global_init) = 1;			\
-		taskUnlock();						\
-	}								\
-} while (DB_GLOBAL(db_global_init) == 0)
-#undef	DB_END_SINGLE_THREAD
-#define	DB_END_SINGLE_THREAD	(void)semGive(DB_GLOBAL(db_global_lock))
-#endif
-
-/*********************************************************************
- * Win16
- *
- * Win16 spinlocks are simple because we cannot possibly be preempted.
- *
- * !!!
- * We should simplify this by always returning a no-need-to-lock lock
- * when we initialize the mutex.
- *********************************************************************/
-#ifdef HAVE_MUTEX_WIN16
-typedef unsigned int tsl_t;
-#define	MUTEX_ALIGN		sizeof(unsigned int)
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-#define	MUTEX_INIT(x)		0
-#define	MUTEX_SET(tsl)		(*(tsl) = 1)
-#define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-#endif
-#endif
-
-/*********************************************************************
- * Win32
- *********************************************************************/
-#ifdef HAVE_MUTEX_WIN32
-#define	MUTEX_FIELDS							\
-	LONG tas;							\
-	LONG nwaiters;							\
-	union {								\
-		HANDLE event;	/* Windows event HANDLE for wakeups */	\
-		u_int32_t id;	/* ID used for shared mutexes */	\
-	} /* anonymous */;
-
-#if defined(LOAD_ACTUAL_MUTEX_CODE)
-#define	MUTEX_SET(tsl)		(!InterlockedExchange((PLONG)tsl, 1))
-#define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-#define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-#endif
-#endif
-
-/*********************************************************************
- * 68K/gcc assembly.
- *********************************************************************/
-#ifdef HAVE_MUTEX_68K_GCC_ASSEMBLY
-typedef unsigned char tsl_t;
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-/*
- * For gcc/68K, 0 is clear, 1 is set.
- */
-#define	MUTEX_SET(tsl) ({						\
-	register tsl_t *__l = (tsl);					\
-	int __r;							\
-	    asm volatile("tas  %1; \n					\
-			  seq  %0"					\
-		: "=dm" (__r), "=m" (*__l)				\
-		: "1" (*__l)						\
-		);							\
-	__r & 1;							\
-})
-
-#define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-#define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-#endif
-#endif
-
-/*********************************************************************
- * ALPHA/gcc assembly.
- *********************************************************************/
-#ifdef HAVE_MUTEX_ALPHA_GCC_ASSEMBLY
-typedef u_int32_t tsl_t;
-#define	MUTEX_ALIGN	4
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-/*
- * For gcc/alpha.  Should return 0 if could not acquire the lock, 1 if
- * lock was acquired properly.
- */
-#ifdef __GNUC__
-static inline int
-MUTEX_SET(tsl_t *tsl) {
-	register tsl_t *__l = tsl;
-	register tsl_t __r;
-	asm volatile(
-		"1:	ldl_l	%0,%2\n"
-		"	blbs	%0,2f\n"
-		"	or	$31,1,%0\n"
-		"	stl_c	%0,%1\n"
-		"	beq	%0,3f\n"
-		"	mb\n"
-		"	br	3f\n"
-		"2:	xor	%0,%0\n"
-		"3:"
-		: "=&r"(__r), "=m"(*__l) : "1"(*__l) : "memory");
-	return __r;
-}
-
-/*
- * Unset mutex. Judging by Alpha Architecture Handbook, the mb instruction
- * might be necessary before unlocking
- */
-static inline int
-MUTEX_UNSET(tsl_t *tsl) {
-	asm volatile("	mb\n");
-	return *tsl = 0;
-}
-#endif
-
-#ifdef __DECC
-#include <alpha/builtins.h>
-#define	MUTEX_SET(tsl)		(__LOCK_LONG_RETRY((tsl), 1) != 0)
-#define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-#endif
-
-#define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-#endif
-#endif
-
-/*********************************************************************
- * ARM/gcc assembly.
- *********************************************************************/
-#ifdef HAVE_MUTEX_ARM_GCC_ASSEMBLY
-typedef unsigned char tsl_t;
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-/*
- * For arm/gcc, 0 is clear, 1 is set.
- */
-#define	MUTEX_SET(tsl) ({						\
-	int __r;							\
-	asm volatile("swpb %0, %1, [%2]"				\
-	    : "=r" (__r) 						\
-	    : "0" (1), "r" (tsl)					\
-	    : "memory"							\
-	    );								\
-	__r & 1;							\
-})
-
-#define	MUTEX_UNSET(tsl)	(*(volatile tsl_t *)(tsl) = 0)
-#define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-#endif
-#endif
-
-/*********************************************************************
- * HPPA/gcc assembly.
- *********************************************************************/
-#ifdef HAVE_MUTEX_HPPA_GCC_ASSEMBLY
-typedef u_int32_t tsl_t;
-#define	MUTEX_ALIGN	16
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-/*
- * The PA-RISC has a "load and clear" instead of a "test and set" instruction.
- * The 32-bit word used by that instruction must be 16-byte aligned.  We could
- * use the "aligned" attribute in GCC but that doesn't work for stack variables.
- */
-#define	MUTEX_SET(tsl) ({						\
-	register tsl_t *__l = (tsl);					\
-	int __r;							\
-	asm volatile("ldcws 0(%1),%0" : "=r" (__r) : "r" (__l));	\
-	__r & 1;							\
-})
-
-#define	MUTEX_UNSET(tsl)	(*(tsl) = -1)
-#define	MUTEX_INIT(tsl)		(MUTEX_UNSET(tsl), 0)
-#endif
-#endif
-
-/*********************************************************************
- * IA64/gcc assembly.
- *********************************************************************/
-#ifdef HAVE_MUTEX_IA64_GCC_ASSEMBLY
-typedef unsigned char tsl_t;
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-/*
- * For gcc/ia64, 0 is clear, 1 is set.
- */
-#define	MUTEX_SET(tsl) ({						\
-	register tsl_t *__l = (tsl);					\
-	long __r;							\
-	asm volatile("xchg1 %0=%1,%3" : "=r"(__r), "=m"(*__l) : "1"(*__l), "r"(1));\
-	__r ^ 1;							\
-})
-
-/*
- * Store through a "volatile" pointer so we get a store with "release"
- * semantics.
- */
-#define	MUTEX_UNSET(tsl)	(*(volatile unsigned char *)(tsl) = 0)
-#define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-#endif
-#endif
-
-/*********************************************************************
- * PowerPC/gcc assembly.
- *********************************************************************/
-#if defined(HAVE_MUTEX_PPC_GENERIC_GCC_ASSEMBLY) ||			\
-    (HAVE_MUTEX_PPC_APPLE_GCC_ASSEMBLY)
-typedef u_int32_t tsl_t;
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-/*
- * The PowerPC does a sort of pseudo-atomic locking.  You set up a
- * 'reservation' on a chunk of memory containing a mutex by loading the
- * mutex value with LWARX.  If the mutex has an 'unlocked' (arbitrary)
- * value, you then try storing into it with STWCX.  If no other process or
- * thread broke your 'reservation' by modifying the memory containing the
- * mutex, then the STCWX succeeds; otherwise it fails and you try to get
- * a reservation again.
- *
- * While mutexes are explicitly 4 bytes, a 'reservation' applies to an
- * entire cache line, normally 32 bytes, aligned naturally.  If the mutex
- * lives near data that gets changed a lot, there's a chance that you'll
- * see more broken reservations than you might otherwise.  The only
- * situation in which this might be a problem is if one processor is
- * beating on a variable in the same cache block as the mutex while another
- * processor tries to acquire the mutex.  That's bad news regardless
- * because of the way it bashes caches, but if you can't guarantee that a
- * mutex will reside in a relatively quiescent cache line, you might
- * consider padding the mutex to force it to live in a cache line by
- * itself.  No, you aren't guaranteed that cache lines are 32 bytes.  Some
- * embedded processors use 16-byte cache lines, while some 64-bit
- * processors use 128-bit cache lines.  But assuming a 32-byte cache line
- * won't get you into trouble for now.
- *
- * If mutex locking is a bottleneck, then you can speed it up by adding a
- * regular LWZ load before the LWARX load, so that you can test for the
- * common case of a locked mutex without wasting cycles making a reservation.
- *
- * 'set' mutexes have the value 1, like on Intel; the returned value from
- * MUTEX_SET() is 1 if the mutex previously had its low bit clear, 0 otherwise.
- *
- * Mutexes on Mac OS X work the same way as the standard PowerPC version, but
- * the assembler syntax is subtly different -- the standard PowerPC version
- * assembles but doesn't work correctly.  This version makes (unnecessary?)
- * use of a stupid linker trick: __db_mutex_tas_dummy is never called, but the
- * ___db_mutex_set label is used as a function name.
- */
-#ifdef HAVE_MUTEX_PPC_APPLE_GCC_ASSEMBLY
-extern int __db_mutex_set __P((volatile tsl_t *));
-void
-__db_mutex_tas_dummy()
-{
-	__asm__	__volatile__("		\n\
-	.globl 	___db_mutex_set		\n\
-___db_mutex_set:			\n\
-	lwarx	r5,0,r3			\n\
-	cmpwi 	r5,0			\n\
-	bne 	fail			\n\
-	addi 	r5,r5,1			\n\
-	stwcx. 	r5,0,r3			\n\
-	beq 	success			\n\
-fail:					\n\
-	li 	r3,0			\n\
-	blr 				\n\
-success:				\n\
-	li 	r3,1			\n\
-	blr");	
-}
-#define	MUTEX_SET(tsl)  __db_mutex_set(tsl)
-#endif
-#ifdef HAVE_MUTEX_PPC_GENERIC_GCC_ASSEMBLY
-#define	MUTEX_SET(tsl)	({		\
-	int __one = 1;			\
-	int __r;			\
-	tsl_t *__l = (tsl);		\
-	asm volatile ("			\
-0:					\
-	lwarx %0,0,%1;			\
-	cmpwi %0,0;			\
-	bne 1f;				\
-	stwcx. %2,0,%1;			\
-	bne- 0b;			\
-1:"					\
-	: "=&r" (__r)			\
-	: "r" (__l), "r" (__one));	\
-	!(__r & 1);			\
-})
-#endif
-#define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-#define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-#endif
-#endif
-
-/*********************************************************************
- * S/390 32-bit assembly.
- *********************************************************************/
-#ifdef HAVE_MUTEX_S390_GCC_ASSEMBLY
-typedef int tsl_t;
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-/*
- * For gcc/S390, 0 is clear, 1 is set.
- */
-static inline int
-MUTEX_SET(tsl_t *tsl) {							\
-	register tsl_t *__l = (tsl);					\
-	int __r;							\
-  asm volatile(								\
-       "    la    1,%1\n"						\
-       "    lhi   0,1\n"						\
-       "    l     %0,%1\n"						\
-       "0:  cs    %0,0,0(1)\n"						\
-       "    jl    0b"							\
-       : "=&d" (__r), "+m" (*__l)					\
-       : : "0", "1", "cc");						\
-	return !__r;							\
-}
-
-#define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-#define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-#endif
-#endif
-
-/*********************************************************************
- * SCO/cc assembly.
- *********************************************************************/
-#ifdef HAVE_MUTEX_SCO_X86_CC_ASSEMBLY
-typedef unsigned char tsl_t;
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-/*
- * UnixWare has threads in libthread, but OpenServer doesn't (yet).
- *
- * For cc/x86, 0 is clear, 1 is set.
- */
-
-#if defined(__USLC__)
-asm int
-_tsl_set(void *tsl)
-{
-%mem tsl
-	movl	tsl, %ecx
-	movl	$1, %eax
-	lock
-	xchgb	(%ecx),%al
-	xorl	$1,%eax
-}
-#endif
-
-#define	MUTEX_SET(tsl)		_tsl_set(tsl)
-#define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-#define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-#endif
-#endif
-
-/*********************************************************************
- * Sparc/gcc assembly.
- *********************************************************************/
-#ifdef HAVE_MUTEX_SPARC_GCC_ASSEMBLY
-typedef unsigned char tsl_t;
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-/*
- *
- * The ldstub instruction takes the location specified by its first argument
- * (a register containing a memory address) and loads its contents into its
- * second argument (a register) and atomically sets the contents the location
- * specified by its first argument to a byte of 1s.  (The value in the second
- * argument is never read, but only overwritten.)
- *
- * The stbar is needed for v8, and is implemented as membar #sync on v9,
- * so is functional there as well.  For v7, stbar may generate an illegal
- * instruction and we have no way to tell what we're running on.  Some
- * operating systems notice and skip this instruction in the fault handler.
- *
- * For gcc/sparc, 0 is clear, 1 is set.
- */
-#define	MUTEX_SET(tsl) ({						\
-	register tsl_t *__l = (tsl);					\
-	register tsl_t __r;						\
-	__asm__ volatile						\
-	    ("ldstub [%1],%0; stbar"					\
-	    : "=r"( __r) : "r" (__l));					\
-	!__r;								\
-})
-
-#define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-#define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-#endif
-#endif
-
-/*********************************************************************
- * UTS/cc assembly.
- *********************************************************************/
-#ifdef HAVE_MUTEX_UTS_CC_ASSEMBLY
-typedef int tsl_t;
-
-#define	MUTEX_ALIGN	sizeof(int)
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-#define	MUTEX_INIT(x)	0
-#define	MUTEX_SET(x)	(!uts_lock(x, 1))
-#define	MUTEX_UNSET(x)	(*(x) = 0)
-#endif
-#endif
-
-/*********************************************************************
- * x86/gcc assembly.
- *********************************************************************/
-#ifdef HAVE_MUTEX_X86_GCC_ASSEMBLY
-typedef unsigned char tsl_t;
-
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-/*
- * For gcc/x86, 0 is clear, 1 is set.
- */
-#define	MUTEX_SET(tsl) ({						\
-	register tsl_t *__l = (tsl);					\
-	int __r;							\
-	asm volatile("movl $1,%%eax; lock; xchgb %1,%%al; xorl $1,%%eax"\
-	    : "=&a" (__r), "=m" (*__l)					\
-	    : "1" (*__l)						\
-	    );								\
-	__r & 1;							\
-})
-
-#define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
-#define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
-#endif
-#endif
-
-/*
- * Mutex alignment defaults to one byte.
- *
- * !!!
- * Various systems require different alignments for mutexes (the worst we've
- * seen so far is 16-bytes on some HP architectures).  Malloc(3) is assumed
- * to return reasonable alignment, all other mutex users must ensure proper
- * alignment locally.
- */
-#ifndef	MUTEX_ALIGN
-#define	MUTEX_ALIGN	1
-#endif
-
-/*
- * Mutex destruction defaults to a no-op.
- */
-#ifdef LOAD_ACTUAL_MUTEX_CODE
-#ifndef	MUTEX_DESTROY
-#define	MUTEX_DESTROY(x)
-#endif
-#endif
-
-/*
- * !!!
- * These defines are separated into the u_int8_t flags stored in the
- * mutex below, and the 32 bit flags passed to __db_mutex_setup.
- * But they must co-exist and not overlap.  Flags to __db_mutex_setup are:
- *
- * MUTEX_ALLOC - Use when the mutex to initialize needs to be allocated.
- *    The 'ptr' arg to __db_mutex_setup should be a DB_MUTEX ** whenever
- *    you use this flag.  If this flag is not set, the 'ptr' arg is
- *    a DB_MUTEX *.
- * MUTEX_NO_RECORD - Explicitly do not record the mutex in the region.
- *    Otherwise the mutex will be recorded by default.  If you set
- *    this you need to understand why you don't need it recorded.  The
- *    *only* ones not recorded are those that are part of region structures
- *    that only get destroyed when the regions are destroyed.
- * MUTEX_NO_RLOCK - Explicitly do not lock the given region otherwise
- *    the region will be locked by default.
- * MUTEX_SELF_BLOCK - Set if self blocking mutex.
- * MUTEX_THREAD - Set if mutex is a thread-only mutex.
- */
-#define	MUTEX_IGNORE		0x001	/* Ignore, no lock required. */
-#define	MUTEX_INITED		0x002	/* Mutex is successfully initialized */
-#define	MUTEX_MPOOL		0x004	/* Allocated from mpool. */
-#define	MUTEX_SELF_BLOCK	0x008	/* Must block self. */
-/* Flags only, may be larger than 0xff. */
-#define	MUTEX_ALLOC		0x00000100 /* Allocate and init a mutex */
-#define	MUTEX_NO_RECORD		0x00000200 /* Do not record lock */
-#define	MUTEX_NO_RLOCK		0x00000400 /* Do not acquire region lock */
-#define	MUTEX_THREAD		0x00000800 /* Thread-only mutex. */
-
-/* Mutex. */
-struct __mutex_t {
-#ifdef	HAVE_MUTEX_THREADS
-#ifdef	MUTEX_FIELDS
-	MUTEX_FIELDS
-#else
-	tsl_t	tas;			/* Test and set. */
-#endif
-	u_int32_t spins;		/* Spins before block. */
-	u_int32_t locked;		/* !0 if locked. */
-#else
-	u_int32_t off;			/* Byte offset to lock. */
-	u_int32_t pid;			/* Lock holder: 0 or process pid. */
-#endif
-	u_int32_t mutex_set_wait;	/* Granted after wait. */
-	u_int32_t mutex_set_nowait;	/* Granted without waiting. */
-	u_int32_t mutex_set_spin;	/* Granted without spinning. */
-	u_int32_t mutex_set_spins;	/* Total number of spins. */
-#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
-	roff_t	  reg_off;		/* Shared lock info offset. */
-#endif
-
-	u_int8_t  flags;		/* MUTEX_XXX */
-};
-
-/* Redirect calls to the correct functions. */
-#ifdef HAVE_MUTEX_THREADS
-#if defined(HAVE_MUTEX_PTHREADS) ||					\
-    defined(HAVE_MUTEX_SOLARIS_LWP) ||					\
-    defined(HAVE_MUTEX_UI_THREADS)
-#define	__db_mutex_init_int(a, b, c, d)	__db_pthread_mutex_init(a, b, d)
-#define	__db_mutex_lock(a, b)		__db_pthread_mutex_lock(a, b)
-#define	__db_mutex_unlock(a, b)		__db_pthread_mutex_unlock(a, b)
-#define	__db_mutex_destroy(a)		__db_pthread_mutex_destroy(a)
-#elif defined(HAVE_MUTEX_WIN32)
-#define	__db_mutex_init_int(a, b, c, d)	__db_win32_mutex_init(a, b, d)
-#define	__db_mutex_lock(a, b)		__db_win32_mutex_lock(a, b)
-#define	__db_mutex_unlock(a, b)		__db_win32_mutex_unlock(a, b)
-#define	__db_mutex_destroy(a)		__db_win32_mutex_destroy(a)
-#else
-#define	__db_mutex_init_int(a, b, c, d)	__db_tas_mutex_init(a, b, d)
-#define	__db_mutex_lock(a, b)		__db_tas_mutex_lock(a, b)
-#define	__db_mutex_unlock(a, b)		__db_tas_mutex_unlock(a, b)
-#define	__db_mutex_destroy(a)		__db_tas_mutex_destroy(a)
-#endif
-#else
-#define	__db_mutex_init_int(a, b, c, d)	__db_fcntl_mutex_init(a, b, c)
-#define	__db_mutex_lock(a, b)		__db_fcntl_mutex_lock(a, b)
-#define	__db_mutex_unlock(a, b)		__db_fcntl_mutex_unlock(a, b)
-#define	__db_mutex_destroy(a)		__db_fcntl_mutex_destroy(a)
-#endif
-
-/* Redirect system resource calls to correct functions */
-#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
-#define	__db_maintinit(a, b, c)		__db_shreg_maintinit(a, b, c)
-#define	__db_shlocks_clear(a, b, c)	__db_shreg_locks_clear(a, b, c)
-#define	__db_shlocks_destroy(a, b)	__db_shreg_locks_destroy(a, b)
-#define	__db_mutex_init(a, b, c, d, e, f)	\
-    __db_shreg_mutex_init(a, b, c, d, e, f)
-#else
-#define	__db_maintinit(a, b, c)
-#define	__db_shlocks_clear(a, b, c)
-#define	__db_shlocks_destroy(a, b)
-#define	__db_mutex_init(a, b, c, d, e, f)	__db_mutex_init_int(a, b, c, d)
-#endif
-
-/*
- * Lock/unlock a mutex.  If the mutex was marked as uninteresting, the thread
- * of control can proceed without it.
- *
- * If the lock is for threads-only, then it was optionally not allocated and
- * file handles aren't necessary, as threaded applications aren't supported by
- * fcntl(2) locking.
- */
-#ifdef DIAGNOSTIC
-	/*
-	 * XXX
-	 * We want to switch threads as often as possible.  Yield every time
-	 * we get a mutex to ensure contention.
-	 */
-#define	MUTEX_LOCK(dbenv, mp)						\
-	if (!F_ISSET((mp), MUTEX_IGNORE))				\
-		DB_ASSERT(__db_mutex_lock(dbenv, mp) == 0);		\
-	if (F_ISSET(dbenv, DB_ENV_YIELDCPU))				\
-		__os_yield(NULL, 1);
-#else
-#define	MUTEX_LOCK(dbenv, mp)						\
-	if (!F_ISSET((mp), MUTEX_IGNORE))				\
-		(void)__db_mutex_lock(dbenv, mp);
-#endif
-#define	MUTEX_UNLOCK(dbenv, mp)						\
-	if (!F_ISSET((mp), MUTEX_IGNORE))				\
-		(void)__db_mutex_unlock(dbenv, mp);
-#define	MUTEX_THREAD_LOCK(dbenv, mp)					\
-	if (mp != NULL)							\
-		MUTEX_LOCK(dbenv, mp)
-#define	MUTEX_THREAD_UNLOCK(dbenv, mp)					\
-	if (mp != NULL)							\
-		MUTEX_UNLOCK(dbenv, mp)
-
-/*
- * We use a single file descriptor for fcntl(2) locking, and (generally) the
- * object's offset in a shared region as the byte that we're locking.  So,
- * there's a (remote) possibility that two objects might have the same offsets
- * such that the locks could conflict, resulting in deadlock.  To avoid this
- * possibility, we offset the region offset by a small integer value, using a
- * different offset for each subsystem's locks.  Since all region objects are
- * suitably aligned, the offset guarantees that we don't collide with another
- * region's objects.
- */
-#define	DB_FCNTL_OFF_GEN	0		/* Everything else. */
-#define	DB_FCNTL_OFF_LOCK	1		/* Lock subsystem offset. */
-#define	DB_FCNTL_OFF_MPOOL	2		/* Mpool subsystem offset. */
-
-#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
-/*
- * When the underlying mutexes require library (most likely heap) or system
- * resources, we have to clean up when we discard mutexes (for the library
- * resources) and both when discarding mutexes and after application failure
- * (for the mutexes requiring system resources).  This violates the rule that
- * we never look at a shared region after application failure, but we've no
- * other choice.  In those cases, the #define HAVE_MUTEX_SYSTEM_RESOURCES is
- * set.
- *
- * To support mutex release after application failure, allocate thread-handle
- * mutexes in shared memory instead of in the heap.  The number of slots we
- * allocate for this purpose isn't configurable, but this tends to be an issue
- * only on embedded systems where we don't expect large server applications.
- */
-#define	DB_MAX_HANDLES	100			/* Mutex slots for handles. */
-#endif
-#endif /* !_DB_MUTEX_H_ */
diff --git a/bdb/dbinc/os.h b/bdb/dbinc/os.h
deleted file mode 100644
index 01ca0ac470d..00000000000
--- a/bdb/dbinc/os.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1997-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: os.h,v 11.14 2002/03/27 04:34:55 bostic Exp $
- */
-
-#ifndef _DB_OS_H_
-#define	_DB_OS_H_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/* DB filehandle. */
-struct __fh_t {
-#if defined(DB_WIN32)
-	HANDLE	  handle;		/* Windows/32 file handle. */
-#endif
-	int	  fd;			/* POSIX file descriptor. */
-	char	*name;			/* File name. */
-
-	u_int32_t log_size;		/* XXX: Log file size. */
-	u_int32_t pagesize;		/* XXX: Page size. */
-
-#define	DB_FH_NOSYNC	0x01		/* Handle doesn't need to be sync'd. */
-#define	DB_FH_UNLINK	0x02		/* Unlink on close */
-#define	DB_FH_VALID	0x04		/* Handle is valid. */
-	u_int8_t flags;
-};
-
-/*
- * We group certain seek/write calls into a single function so that we
- * can use pread(2)/pwrite(2) where they're available.
- */
-#define	DB_IO_READ	1
-#define	DB_IO_WRITE	2
-typedef struct __io_t {
-	DB_FH	  *fhp;			/* I/O file handle. */
-	DB_MUTEX  *mutexp;		/* Mutex to lock. */
-	size_t	   pagesize;		/* Page size. */
-	db_pgno_t  pgno;		/* Page number. */
-	u_int8_t  *buf;			/* Buffer. */
-	size_t	   bytes;		/* Bytes read/written. */
-} DB_IO;
-
-#if defined(__cplusplus)
-}
-#endif
-
-#include "dbinc_auto/os_ext.h"
-#endif /* !_DB_OS_H_ */
diff --git a/bdb/dbinc/qam.h b/bdb/dbinc/qam.h
deleted file mode 100644
index 0306ed07d2a..00000000000
--- a/bdb/dbinc/qam.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1999-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: qam.h,v 11.38 2002/08/06 06:11:21 bostic Exp $
- */
-
-#ifndef	_DB_QAM_H_
-#define	_DB_QAM_H_
-
-/*
- * QAM data elements: a status field and the data.
- */
-typedef struct _qamdata {
-	u_int8_t  flags;	/* 00: delete bit. */
-#define	QAM_VALID	0x01
-#define	QAM_SET		0x02
-	u_int8_t  data[1];	/* Record. */
-} QAMDATA;
-
-struct __queue;		typedef struct __queue QUEUE;
-struct __qcursor;	typedef struct __qcursor QUEUE_CURSOR;
-
-struct __qcursor {
-	/* struct __dbc_internal */
-	__DBC_INTERNAL
-
-	/* Queue private part */
-
-	/* Per-thread information: queue private. */
-	db_recno_t	 recno;		/* Current record number. */
-
-	u_int32_t	 flags;
-};
-
-typedef struct __mpfarray {
-	u_int32_t n_extent;		/* Number of extents in table. */
-	u_int32_t low_extent;		/* First extent open. */
-	u_int32_t hi_extent;		/* Last extent open. */
-	struct __qmpf {
-		int pinref;
-		DB_MPOOLFILE *mpf;
-	} *mpfarray;			 /* Array of open extents. */
-} MPFARRAY;
-
-/*
- * The in-memory, per-tree queue data structure.
- */
-struct __queue {
-	db_pgno_t q_meta;		/* Database meta-data page. */
-	db_pgno_t q_root;		/* Database root page. */
-
-	int	  re_pad;		/* Fixed-length padding byte. */
-	u_int32_t re_len;		/* Length for fixed-length records. */
-	u_int32_t rec_page;		/* records per page */
-	u_int32_t page_ext;		/* Pages per extent */
-	MPFARRAY array1, array2;	/* File arrays. */
-
-					/* Extent file configuration: */
-	DBT pgcookie;			/* Initialized pgcookie. */
-	DB_PGINFO pginfo;		/* Initialized pginfo struct. */
-
-	char *path;			/* Space allocated to file pathname. */
-	char *name;			/* The name of the file. */
-	char *dir;			/* The dir of the file. */
-	int mode;			/* Mode to open extents. */
-};
-
-/* Format for queue extent names. */
-#define	QUEUE_EXTENT "%s%c__dbq.%s.%d"
-
-typedef struct __qam_filelist {
-	DB_MPOOLFILE *mpf;
-	u_int32_t id;
-} QUEUE_FILELIST;
-
-/*
- * Caculate the page number of a recno
- *
- * Number of records per page =
- *	Divide the available space on the page by the record len + header.
- *
- * Page number for record =
- *	divide the physical record number by the records per page
- *	add the root page number
- *	For now the root page will always be 1, but we might want to change
- *	in the future (e.g. multiple fixed len queues per file).
- *
- * Index of record on page =
- *	physical record number, less the logical pno times records/page
- */
-#define	CALC_QAM_RECNO_PER_PAGE(dbp)					\
-    (((dbp)->pgsize - QPAGE_SZ(dbp)) /					\
-    ALIGN(((QUEUE *)(dbp)->q_internal)->re_len +			\
-    sizeof(QAMDATA) - SSZA(QAMDATA, data), sizeof(u_int32_t)))
-
-#define	QAM_RECNO_PER_PAGE(dbp)	(((QUEUE*)(dbp)->q_internal)->rec_page)
-
-#define	QAM_RECNO_PAGE(dbp, recno)					\
-    (((QUEUE *)(dbp)->q_internal)->q_root				\
-    + (((recno) - 1) / QAM_RECNO_PER_PAGE(dbp)))
-
-#define	QAM_RECNO_INDEX(dbp, pgno, recno)				\
-    (((recno) - 1) - (QAM_RECNO_PER_PAGE(dbp)				\
-    * (pgno - ((QUEUE *)(dbp)->q_internal)->q_root)))
-
-#define	QAM_GET_RECORD(dbp, page, index)				\
-    ((QAMDATA *)((u_int8_t *)(page) +					\
-    QPAGE_SZ(dbp) + (ALIGN(sizeof(QAMDATA) - SSZA(QAMDATA, data) +	\
-    ((QUEUE *)(dbp)->q_internal)->re_len, sizeof(u_int32_t)) * index)))
-
-#define	QAM_AFTER_CURRENT(meta, recno)					\
-    ((recno) > (meta)->cur_recno &&					\
-    ((meta)->first_recno <= (meta)->cur_recno || (recno) < (meta)->first_recno))
-
-#define	QAM_BEFORE_FIRST(meta, recno)					\
-    ((recno) < (meta)->first_recno &&					\
-    ((meta->first_recno <= (meta)->cur_recno || (recno) > (meta)->cur_recno)))
-
-#define	QAM_NOT_VALID(meta, recno)					\
-    (recno == RECNO_OOB ||						\
-	QAM_BEFORE_FIRST(meta, recno) || QAM_AFTER_CURRENT(meta, recno))
-
-/*
- * Log opcodes for the mvptr routine.
- */
-#define	QAM_SETFIRST		0x01
-#define	QAM_SETCUR		0x02
-#define	QAM_TRUNCATE		0x04
-
-/*
- * Parameter to __qam_position.
- */
-typedef enum {
-	QAM_READ,
-	QAM_WRITE,
-	QAM_CONSUME
-} qam_position_mode;
-
-typedef enum {
-	QAM_PROBE_GET,
-	QAM_PROBE_PUT,
-	QAM_PROBE_MPF
-} qam_probe_mode;
-
-#define	__qam_fget(dbp, pgnoaddr, flags, addrp) \
-	__qam_fprobe(dbp, *pgnoaddr, addrp, QAM_PROBE_GET, flags)
-
-#define	__qam_fput(dbp, pageno, addrp, flags) \
-	__qam_fprobe(dbp, pageno, addrp, QAM_PROBE_PUT, flags)
-
-#include "dbinc_auto/qam_auto.h"
-#include "dbinc_auto/qam_ext.h"
-#endif /* !_DB_QAM_H_ */
diff --git a/bdb/dbinc/queue.h b/bdb/dbinc/queue.h
deleted file mode 100644
index 8d4a771add6..00000000000
--- a/bdb/dbinc/queue.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- */
-
-/*
- * XXX
- * We #undef the queue macros because there are incompatible versions of this
- * file and these macros on various systems.  What makes the problem worse is
- * they are included and/or defined by system include files which we may have
- * already loaded into Berkeley DB before getting here.  For example, FreeBSD's
- * <rpc/rpc.h> includes its system <sys/queue.h>, and VxWorks UnixLib.h defines
- * several of the LIST_XXX macros.  Make sure we use ours.
- */
-#undef	LIST_HEAD
-#undef	LIST_ENTRY
-#undef	LIST_FIRST
-#undef	LIST_NEXT
-#undef	LIST_INIT
-#undef	LIST_INSERT_AFTER
-#undef	LIST_INSERT_BEFORE
-#undef	LIST_INSERT_HEAD
-#undef	LIST_REMOVE
-#undef	TAILQ_HEAD
-#undef	TAILQ_ENTRY
-#undef	TAILQ_FIRST
-#undef	TAILQ_NEXT
-#undef	TAILQ_INIT
-#undef	TAILQ_INSERT_HEAD
-#undef	TAILQ_INSERT_TAIL
-#undef	TAILQ_INSERT_AFTER
-#undef	TAILQ_INSERT_BEFORE
-#undef	TAILQ_REMOVE
-#undef	CIRCLEQ_HEAD
-#undef	CIRCLEQ_ENTRY
-#undef	CIRCLEQ_FIRST
-#undef	CIRCLEQ_LAST
-#undef	CIRCLEQ_NEXT
-#undef	CIRCLEQ_PREV
-#undef	CIRCLEQ_INIT
-#undef	CIRCLEQ_INSERT_AFTER
-#undef	CIRCLEQ_INSERT_BEFORE
-#undef	CIRCLEQ_INSERT_HEAD
-#undef	CIRCLEQ_INSERT_TAIL
-#undef	CIRCLEQ_REMOVE
-
-/*
- * This file defines three types of data structures: lists, tail queues,
- * and circular queues.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may only be traversed in the forward direction.
- *
- * A circle queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or after
- * an existing element, at the head of the list, or at the end of the list.
- * A circle queue may be traversed in either direction, but has a more
- * complex end of list detection.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- */
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- * List definitions.
- */
-#define	LIST_HEAD(name, type)						\
-struct name {								\
-	struct type *lh_first;	/* first element */			\
-}
-
-#define	LIST_ENTRY(type)						\
-struct {								\
-	struct type *le_next;	/* next element */			\
-	struct type **le_prev;	/* address of previous next element */	\
-}
-
-#define	LIST_FIRST(head)		((head)->lh_first)
-#define	LIST_NEXT(elm, field)		((elm)->field.le_next)
-
-/*
- * List functions.
- */
-#define	LIST_INIT(head) {						\
-	(head)->lh_first = NULL;					\
-}
-
-#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
-	if (((elm)->field.le_next = (listelm)->field.le_next) != NULL)	\
-		(listelm)->field.le_next->field.le_prev =		\
-		    &(elm)->field.le_next;				\
-	(listelm)->field.le_next = (elm);				\
-	(elm)->field.le_prev = &(listelm)->field.le_next;		\
-} while (0)
-
-#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-	(elm)->field.le_next = (listelm);				\
-	*(listelm)->field.le_prev = (elm);				\
-	(listelm)->field.le_prev = &(elm)->field.le_next;		\
-} while (0)
-
-#define	LIST_INSERT_HEAD(head, elm, field) do {				\
-	if (((elm)->field.le_next = (head)->lh_first) != NULL)		\
-		(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
-	(head)->lh_first = (elm);					\
-	(elm)->field.le_prev = &(head)->lh_first;			\
-} while (0)
-
-#define	LIST_REMOVE(elm, field) do {					\
-	if ((elm)->field.le_next != NULL)				\
-		(elm)->field.le_next->field.le_prev =			\
-		    (elm)->field.le_prev;				\
-	*(elm)->field.le_prev = (elm)->field.le_next;			\
-} while (0)
-
-/*
- * Tail queue definitions.
- */
-#define	TAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *tqh_first;	/* first element */			\
-	struct type **tqh_last;	/* addr of last next element */		\
-}
-
-#define	TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-}
-
-#define	TAILQ_FIRST(head)		((head)->tqh_first)
-#define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)
-
-/*
- * Tail queue functions.
- */
-#define	TAILQ_INIT(head) do {						\
-	(head)->tqh_first = NULL;					\
-	(head)->tqh_last = &(head)->tqh_first;				\
-} while (0)
-
-#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)	\
-		(head)->tqh_first->field.tqe_prev =			\
-		    &(elm)->field.tqe_next;				\
-	else								\
-		(head)->tqh_last = &(elm)->field.tqe_next;		\
-	(head)->tqh_first = (elm);					\
-	(elm)->field.tqe_prev = &(head)->tqh_first;			\
-} while (0)
-
-#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
-	(elm)->field.tqe_next = NULL;					\
-	(elm)->field.tqe_prev = (head)->tqh_last;			\
-	*(head)->tqh_last = (elm);					\
-	(head)->tqh_last = &(elm)->field.tqe_next;			\
-} while (0)
-
-#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
-		(elm)->field.tqe_next->field.tqe_prev =		\
-		    &(elm)->field.tqe_next;				\
-	else								\
-		(head)->tqh_last = &(elm)->field.tqe_next;		\
-	(listelm)->field.tqe_next = (elm);				\
-	(elm)->field.tqe_prev = &(listelm)->field.tqe_next;		\
-} while (0)
-
-#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	(elm)->field.tqe_next = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
-} while (0)
-
-#define	TAILQ_REMOVE(head, elm, field) do {				\
-	if (((elm)->field.tqe_next) != NULL)				\
-		(elm)->field.tqe_next->field.tqe_prev =		\
-		    (elm)->field.tqe_prev;				\
-	else								\
-		(head)->tqh_last = (elm)->field.tqe_prev;		\
-	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
-} while (0)
-
-/*
- * This macro is used to fixup the queue after moving the head.
- */
-#define	TAILQ_REINSERT_HEAD(head, elm, field) do {			\
-	DB_ASSERT((head)->tqh_first == (elm));				\
-	(elm)->field.tqe_prev = &(head)->tqh_first;                     \
-} while (0)
-
-/*
- * Circular queue definitions.
- */
-#define	CIRCLEQ_HEAD(name, type)					\
-struct name {								\
-	struct type *cqh_first;		/* first element */		\
-	struct type *cqh_last;		/* last element */		\
-}
-
-#define	CIRCLEQ_ENTRY(type)						\
-struct {								\
-	struct type *cqe_next;		/* next element */		\
-	struct type *cqe_prev;		/* previous element */		\
-}
-
-#define	CIRCLEQ_FIRST(head)		((head)->cqh_first)
-#define	CIRCLEQ_LAST(head)		((head)->cqh_last)
-#define	CIRCLEQ_NEXT(elm, field)	((elm)->field.cqe_next)
-#define	CIRCLEQ_PREV(elm, field)	((elm)->field.cqe_prev)
-
-/*
- * Circular queue functions.
- */
-#define	CIRCLEQ_INIT(head) do {						\
-	(head)->cqh_first = (void *)(head);				\
-	(head)->cqh_last = (void *)(head);				\
-} while (0)
-
-#define	CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
-	(elm)->field.cqe_prev = (listelm);				\
-	if ((listelm)->field.cqe_next == (void *)(head))		\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
-	(listelm)->field.cqe_next = (elm);				\
-} while (0)
-
-#define	CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {		\
-	(elm)->field.cqe_next = (listelm);				\
-	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
-	if ((listelm)->field.cqe_prev == (void *)(head))		\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
-	(listelm)->field.cqe_prev = (elm);				\
-} while (0)
-
-#define	CIRCLEQ_INSERT_HEAD(head, elm, field) do {			\
-	(elm)->field.cqe_next = (head)->cqh_first;			\
-	(elm)->field.cqe_prev = (void *)(head);				\
-	if ((head)->cqh_last == (void *)(head))				\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(head)->cqh_first->field.cqe_prev = (elm);		\
-	(head)->cqh_first = (elm);					\
-} while (0)
-
-#define	CIRCLEQ_INSERT_TAIL(head, elm, field) do {			\
-	(elm)->field.cqe_next = (void *)(head);				\
-	(elm)->field.cqe_prev = (head)->cqh_last;			\
-	if ((head)->cqh_first == (void *)(head))			\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(head)->cqh_last->field.cqe_next = (elm);		\
-	(head)->cqh_last = (elm);					\
-} while (0)
-
-#define	CIRCLEQ_REMOVE(head, elm, field) do {				\
-	if ((elm)->field.cqe_next == (void *)(head))			\
-		(head)->cqh_last = (elm)->field.cqe_prev;		\
-	else								\
-		(elm)->field.cqe_next->field.cqe_prev =			\
-		    (elm)->field.cqe_prev;				\
-	if ((elm)->field.cqe_prev == (void *)(head))			\
-		(head)->cqh_first = (elm)->field.cqe_next;		\
-	else								\
-		(elm)->field.cqe_prev->field.cqe_next =			\
-		    (elm)->field.cqe_next;				\
-} while (0)
-
-#if defined(__cplusplus)
-}
-#endif
diff --git a/bdb/dbinc/region.h b/bdb/dbinc/region.h
deleted file mode 100644
index 9ee6c81062f..00000000000
--- a/bdb/dbinc/region.h
+++ /dev/null
@@ -1,304 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1998-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: region.h,v 11.33 2002/08/06 06:11:22 bostic Exp $
- */
-
-#ifndef _DB_REGION_H_
-#define	_DB_REGION_H_
-
-/*
- * The DB environment consists of some number of "regions", which are described
- * by the following four structures:
- *
- *	REGENV	   -- shared information about the environment
- *	REGENV_REF -- file describing system memory version of REGENV
- *	REGION	   -- shared information about a single region
- *	REGINFO	   -- per-process information about a REGION
- *
- * There are three types of memory that hold regions:
- *	per-process heap (malloc)
- *	file mapped into memory (mmap, MapViewOfFile)
- *	system memory (shmget, CreateFileMapping)
- *
- * If the regions are private to a process, they're in malloc.  If they're
- * public, they're in file mapped memory, or, optionally, in system memory.
- * Regions in the filesystem are named "__db.001", "__db.002" and so on.  If
- * we're not using a private environment allocated using malloc(3), the file
- * "__db.001" will always exist, as we use it to synchronize on the regions,
- * whether they exist in file mapped memory or system memory.
- *
- * The file "__db.001" contains a REGENV structure and a linked list of some
- * number of REGION structures.  Each of the REGION structures describes and
- * locks one of the underlying shared regions used by DB.
- *
- *	__db.001
- *	+---------+
- *	|REGENV  |
- *	+---------+   +----------+
- *	|REGION   |-> | __db.002 |
- *	|	  |   +----------+
- *	+---------+   +----------+
- *	|REGION   |-> | __db.003 |
- *	|	  |   +----------+
- *	+---------+   +----------+
- *	|REGION   |-> | __db.004 |
- *	|	  |   +----------+
- *	+---------+
- *
- * The only tricky part about manipulating the regions is correctly creating
- * or joining the REGENV file, i.e., __db.001.  We have to be absolutely sure
- * that only one process creates it, and that everyone else joins it without
- * seeing inconsistent data.  Once that region is created, we can use normal
- * shared locking procedures to do mutal exclusion for all other regions.
- *
- * One of the REGION structures in the main environment region describes the
- * environment region itself.
- *
- * To lock a region, locate the REGION structure that describes it and acquire
- * the region's mutex.  There is one exception to this rule -- the lock for the
- * environment region itself is in the REGENV structure, and not in the REGION
- * that describes the environment region.  That's so that we can acquire a lock
- * without walking linked lists that could potentially change underneath us.
- * The REGION will not be moved or removed during the life of the region, and
- * so long-lived references to it can be held by the process.
- *
- * All requests to create or join a region return a REGINFO structure, which
- * is held by the caller and used to open and subsequently close the reference
- * to the region.  The REGINFO structure contains the per-process information
- * that we need to access the region.
- *
- * The one remaining complication.  If the regions (including the environment
- * region) live in system memory, and the system memory isn't "named" somehow
- * in the filesystem name space, we need some way of finding it.  Do this by
- * by writing the REGENV_REF structure into the "__db.001" file.  When we find
- * a __db.001 file that is too small to be a real, on-disk environment, we use
- * the information it contains to redirect to the real "__db.001" file/memory.
- * This currently only happens when the REGENV file is in shared system memory.
- *
- * Although DB does not currently grow regions when they run out of memory, it
- * would be possible to do so.  To grow a region, allocate a new region of the
- * appropriate size, then copy the old region over it and insert the additional
- * space into the already existing shalloc arena.  Callers may have to fix up
- * local references, but that should be easy to do.  This failed in historic
- * versions of DB because the region lock lived in the mapped memory, and when
- * it was unmapped and remapped (or copied), threads could lose track of it.
- * Once we moved that lock into a region that is never unmapped, growing should
- * work.  That all said, current versions of DB don't implement region grow
- * because some systems don't support mutex copying, e.g., from OSF1 V4.0:
- *
- *	The address of an msemaphore structure may be significant.  If the
- *	msemaphore structure contains any value copied from an msemaphore
- *	structure at a different address, the result is undefined.
- */
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#define	DB_REGION_FMT	"__db.%03d"	/* Region file name format. */
-#define	DB_REGION_NAME_NUM	5	/* First digit offset in file names. */
-#define	DB_REGION_NAME_LENGTH	8	/* Length of file names. */
-
-#define	DB_REGION_ENV	"__db.001"	/* Primary environment name. */
-
-#define	INVALID_REGION_ID	0	/* Out-of-band region ID. */
-#define	REGION_ID_ENV		1	/* Primary environment ID. */
-
-typedef enum {
-	INVALID_REGION_TYPE=0,		/* Region type. */
-	REGION_TYPE_ENV,
-	REGION_TYPE_LOCK,
-	REGION_TYPE_LOG,
-	REGION_TYPE_MPOOL,
-	REGION_TYPE_MUTEX,
-	REGION_TYPE_TXN } reg_type;
-
-#define	INVALID_REGION_SEGID	-1	/* Segment IDs are either shmget(2) or
-					 * Win16 segment identifiers.  They are
-					 * both stored in a "long", and we need
-					 * an out-of-band value.
-					 */
-/*
- * Nothing can live at region offset 0, because, in all cases, that's where
- * we store *something*.  Lots of code needs an out-of-band value for region
- * offsets, so we use 0.
- */
-#define	INVALID_ROFF		0
-
-/* Reference describing system memory version of REGENV. */
-typedef struct __db_reg_env_ref {
-	roff_t	   size;		/* Region size. */
-	long	   segid;		/* UNIX shmget ID, VxWorks ID. */
-} REGENV_REF;
-
-/* Per-environment region information. */
-typedef struct __db_reg_env {
-	/*
-	 * !!!
-	 * The mutex must be the first entry in the structure to guarantee
-	 * correct alignment.
-	 */
-	DB_MUTEX   mutex;		/* Environment mutex. */
-
-	/*
-	 * !!!
-	 * Note, the magic and panic fields are NOT protected by any mutex,
-	 * and for this reason cannot be anything more complicated than a
-	 * zero/non-zero value.
-	 *
-	 * !!!
-	 * The valid region magic number must appear at the same byte offset
-	 * in both the environment and each shared region, as Windows/95 uses
-	 * it to determine if the memory has been zeroed since it was last used.
-	 */
-	u_int32_t  magic;		/* Valid region magic number. */
-
-	int	   envpanic;		/* Environment is dead. */
-
-	int	   majver;		/* Major DB version number. */
-	int	   minver;		/* Minor DB version number. */
-	int	   patch;		/* Patch DB version number. */
-
-	u_int32_t  init_flags;		/* Flags the env was initialized with.*/
-	roff_t	   cipher_off;		/* Offset of cipher area */
-
-					/* List of regions. */
-	SH_LIST_HEAD(__db_regionh) regionq;
-
-	u_int32_t  refcnt;		/* References to the environment. */
-
-	roff_t	   rep_off;		/* Offset of the replication area. */
-
-	size_t	   pad;			/* Guarantee that following memory is
-					 * size_t aligned.  This is necessary
-					 * because we're going to store the
-					 * allocation region information there.
-					 */
-} REGENV;
-
-/* Per-region shared region information. */
-typedef struct __db_region {
-	/*
-	 * !!!
-	 * The mutex must be the first entry in the structure to guarantee
-	 * correct alignment.
-	 */
-	DB_MUTEX   mutex;		/* Region mutex. */
-
-	/*
-	 * !!!
-	 * The valid region magic number must appear at the same byte offset
-	 * in both the environment and each shared region, as Windows/95 uses
-	 * it to determine if the memory has been zeroed since it was last used.
-	 */
-	u_int32_t  magic;
-
-	SH_LIST_ENTRY q;		/* Linked list of REGIONs. */
-
-	reg_type   type;		/* Region type. */
-	u_int32_t  id;			/* Region id. */
-
-	roff_t	   size;		/* Region size in bytes. */
-
-	roff_t	   primary;		/* Primary data structure offset. */
-
-	long	   segid;		/* UNIX shmget(2), Win16 segment ID. */
-} REGION;
-
-/*
- * Per-process/per-attachment information about a single region.
- */
-struct __db_reginfo_t {		/* __db_r_attach IN parameters. */
-	reg_type    type;		/* Region type. */
-	u_int32_t   id;			/* Region id. */
-	int	    mode;		/* File creation mode. */
-
-				/* __db_r_attach OUT parameters. */
-	REGION	   *rp;			/* Shared region. */
-
-	char	   *name;		/* Region file name. */
-
-	void	   *addr;		/* Region allocation address. */
-	void	   *primary;		/* Primary data structure address. */
-
-	void	   *wnt_handle;		/* Win/NT HANDLE. */
-
-#define	REGION_CREATE		0x01	/* Caller created region. */
-#define	REGION_CREATE_OK	0x02	/* Caller willing to create region. */
-#define	REGION_JOIN_OK		0x04	/* Caller is looking for a match. */
-	u_int32_t   flags;
-};
-
-/*
- * Mutex maintenance information each subsystem region must keep track
- * of to manage resources adequately.
- */
-typedef struct __db_regmaint_stat_t {
-	u_int32_t	st_hint_hit;
-	u_int32_t	st_hint_miss;
-	u_int32_t	st_records;
-	u_int32_t	st_clears;
-	u_int32_t	st_destroys;
-	u_int32_t	st_max_locks;
-} REGMAINT_STAT;
-
-typedef struct __db_regmaint_t {
-	u_int32_t  reglocks;		/* Maximum # of mutexes we track. */
-	u_int32_t  regmutex_hint;	/* Hint for next slot */
-	REGMAINT_STAT stat;		/* Stats */
-	roff_t	   regmutexes[1];	/* Region mutexes in use. */
-} REGMAINT;
-
-/*
- * R_ADDR	Return a per-process address for a shared region offset.
- * R_OFFSET	Return a shared region offset for a per-process address.
- *
- * !!!
- * R_OFFSET should really be returning a ptrdiff_t, but that's not yet
- * portable.  We use u_int32_t, which restricts regions to 4Gb in size.
- */
-#define	R_ADDR(base, offset)						\
-	((void *)((u_int8_t *)((base)->addr) + offset))
-#define	R_OFFSET(base, p)						\
-	((u_int32_t)((u_int8_t *)(p) - (u_int8_t *)(base)->addr))
-
-/*
- * R_LOCK	Lock/unlock a region.
- * R_UNLOCK
- */
-#define	R_LOCK(dbenv, reginfo)						\
-	MUTEX_LOCK(dbenv, &(reginfo)->rp->mutex)
-#define	R_UNLOCK(dbenv, reginfo)					\
-	MUTEX_UNLOCK(dbenv, &(reginfo)->rp->mutex)
-
-/* PANIC_CHECK:	Check to see if the DB environment is dead. */
-#define	PANIC_CHECK(dbenv)						\
-	if (!F_ISSET((dbenv), DB_ENV_NOPANIC) &&			\
-	    (dbenv)->reginfo != NULL && ((REGENV *)			\
-	    ((REGINFO *)(dbenv)->reginfo)->primary)->envpanic != 0)	\
-		return (__db_panic_msg(dbenv));
-
-#define	PANIC_SET(dbenv, onoff)						\
-	((REGENV *)((REGINFO *)(dbenv)->reginfo)->primary)->envpanic = (onoff);
-
-/*
- * All regions are created on 8K boundaries out of sheer paranoia, so we
- * don't make some underlying VM unhappy. Make sure we don't overflow or
- * underflow.
- */
-#define	OS_VMPAGESIZE		(8 * 1024)
-#define	OS_VMROUNDOFF(i) {						\
-	if ((i) <							\
-	    (UINT32_T_MAX - OS_VMPAGESIZE) + 1 || (i) < OS_VMPAGESIZE)	\
-		(i) += OS_VMPAGESIZE - 1;				\
-	(i) -= (i) % OS_VMPAGESIZE;					\
-}
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_DB_REGION_H_ */
diff --git a/bdb/dbinc/rep.h b/bdb/dbinc/rep.h
deleted file mode 100644
index 1e315494c87..00000000000
--- a/bdb/dbinc/rep.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2001-2002
- *	Sleepycat Software.  All rights reserved.
- */
-
-#ifndef _REP_H_
-#define	_REP_H_
-
-#define	REP_ALIVE	1	/* I am alive message. */
-#define	REP_ALIVE_REQ	2	/* Request for alive messages. */
-#define	REP_ALL_REQ	3	/* Request all log records greater than LSN. */
-#define	REP_ELECT	4	/* Indicates that all listeners should */
-				/* begin master election */
-#define	REP_FILE	6	/* Page of a database file. */
-#define	REP_FILE_REQ	7	/* Request for a database file. */
-#define	REP_LOG		8	/* Log record. */
-#define	REP_LOG_MORE	9	/* There are more log records to request. */
-#define	REP_LOG_REQ	10	/* Request for a log record. */
-#define	REP_MASTER_REQ	11	/* Who is the master */
-#define	REP_NEWCLIENT	12	/* Announces the presence of a new client. */
-#define	REP_NEWFILE	13	/* Announce a log file change. */
-#define	REP_NEWMASTER	14	/* Announces who the master is. */
-#define	REP_NEWSITE	15	/* Announces that a site has heard from a new
-				 * site; like NEWCLIENT, but indirect.  A
-				 * NEWCLIENT message comes directly from the new
-				 * client while a NEWSITE comes indirectly from
-				 * someone who heard about a NEWSITE.
-				 */
-#define	REP_PAGE	16	/* Database page. */
-#define	REP_PAGE_REQ	17	/* Request for a database page. */
-#define	REP_PLIST	18	/* Database page list. */
-#define	REP_PLIST_REQ	19	/* Request for a page list. */
-#define	REP_VERIFY	20	/* A log record for verification. */
-#define	REP_VERIFY_FAIL	21	/* The client is outdated. */
-#define	REP_VERIFY_REQ	22	/* Request for a log record to verify. */
-#define	REP_VOTE1	23	/* Send out your information for an election. */
-#define	REP_VOTE2	24	/* Send a "you are master" vote. */
-
-/* Used to consistently designate which messages ought to be received where. */
-#define	MASTER_ONLY(dbenv)	\
-	if (!F_ISSET(dbenv, DB_ENV_REP_MASTER)) return (EINVAL)
-
-#define	CLIENT_ONLY(dbenv)	\
-	if (!F_ISSET(dbenv, DB_ENV_REP_CLIENT)) return (EINVAL)
-
-#define	ANYSITE(dbenv)
-
-/* Shared replication structure. */
-
-typedef struct __rep {
-	/*
-	 * Due to alignment constraints on some architectures (e.g. HP-UX),
-	 * DB_MUTEXes must be the first element of shalloced structures,
-	 * and as a corollary there can be only one per structure.  Thus,
-	 * db_mutex_off points to a mutex in a separately-allocated chunk.
-	 */
-	DB_MUTEX	mutex;		/* Region lock. */
-	roff_t		db_mutex_off;	/* Client database mutex. */
-	u_int32_t	tally_off;	/* Offset of the tally region. */
-	int		eid;		/* Environment id. */
-	int		master_id;	/* ID of the master site. */
-	u_int32_t	gen;		/* Replication generation number */
-	int		asites;		/* Space allocated for sites. */
-	int		nsites;		/* Number of sites in group. */
-	int		priority;	/* My priority in an election. */
-	u_int32_t	gbytes;		/* Limit on data sent in single... */
-	u_int32_t	bytes;		/* __rep_process_message call. */
-#define	DB_REP_REQUEST_GAP	4
-#define	DB_REP_MAX_GAP		128
-	u_int32_t	request_gap;	/* # of records to receive before we
-					 * request a missing log record. */
-	u_int32_t	max_gap;	/* Maximum number of records before
-					 * requesting a missing log record. */
-
-	/* Vote tallying information. */
-	int		sites;		/* Sites heard from. */
-	int		winner;		/* Current winner. */
-	int		w_priority;	/* Winner priority. */
-	u_int32_t	w_gen;		/* Winner generation. */
-	DB_LSN		w_lsn;		/* Winner LSN. */
-	int		w_tiebreaker;	/* Winner tiebreaking value. */
-	int		votes;		/* Number of votes for this site. */
-
-	/* Statistics. */
-	DB_REP_STAT	stat;
-
-#define	REP_F_EPHASE1	0x01		/* In phase 1 of election. */
-#define	REP_F_EPHASE2	0x02		/* In phase 2 of election. */
-#define	REP_F_LOGSONLY	0x04		/* Log-site only; cannot be upgraded. */
-#define	REP_F_MASTER	0x08		/* Master replica. */
-#define	REP_F_RECOVER	0x10
-#define	REP_F_UPGRADE	0x20		/* Upgradeable replica. */
-#define	REP_ISCLIENT	(REP_F_UPGRADE | REP_F_LOGSONLY)
-	u_int32_t	flags;
-} REP;
-
-#define	IN_ELECTION(R)		F_ISSET((R), REP_F_EPHASE1 | REP_F_EPHASE2)
-#define	ELECTION_DONE(R)	F_CLR((R), REP_F_EPHASE1 | REP_F_EPHASE2)
-
-/*
- * Per-process replication structure.
- */
-struct __db_rep {
-	DB_MUTEX	*mutexp;
-
-	DB_MUTEX	*db_mutexp;	/* Mutex for bookkeeping database. */
-	DB		*rep_db;	/* Bookkeeping database. */
-
-	REP		*region;	/* In memory structure. */
-	int		(*rep_send)	/* Send function. */
-			    __P((DB_ENV *,
-			    const DBT *, const DBT *, int, u_int32_t));
-};
-
-/*
- * Control structure for replication communication infrastructure.
- *
- * Note that the version information should be at the beginning of the
- * structure, so that we can rearrange the rest of it while letting the
- * version checks continue to work.  DB_REPVERSION should be revved any time
- * the rest of the structure changes.
- */
-typedef struct __rep_control {
-#define	DB_REPVERSION	1
-	u_int32_t	rep_version;	/* Replication version number. */
-	u_int32_t	log_version;	/* Log version number. */
-
-	DB_LSN		lsn;		/* Log sequence number. */
-	u_int32_t	rectype;	/* Message type. */
-	u_int32_t	gen;		/* Generation number. */
-	u_int32_t	flags;		/* log_put flag value. */
-} REP_CONTROL;
-
-/* Election vote information. */
-typedef struct __rep_vote {
-	int	priority;		/* My site's priority. */
-	int	nsites;			/* Number of sites I've been in
-					 * communication with. */
-	int	tiebreaker;		/* Tie-breaking quasi-random int. */
-} REP_VOTE_INFO;
-
-/*
- * This structure takes care of representing a transaction.
- * It holds all the records, sorted by page number so that
- * we can obtain locks and apply updates in a deadlock free
- * order.
- */
-typedef struct __lsn_page {
-	DB_LSN		lsn;
-	u_int32_t	fid;
-	DB_LOCK_ILOCK	pgdesc;
-#define	LSN_PAGE_NOLOCK		0x0001	/* No lock necessary for log rec. */
-	u_int32_t	flags;
-} LSN_PAGE;
-
-typedef struct __txn_recs {
-	int		npages;
-	int		nalloc;
-	LSN_PAGE	*array;
-	u_int32_t	txnid;
-	u_int32_t	lockid;
-} TXN_RECS;
-
-typedef struct __lsn_collection {
-	int nlsns;
-	int nalloc;
-	DB_LSN *array;
-} LSN_COLLECTION;
-
-/*
- * This is used by the page-prep routines to do the lock_vec call to
- * apply the updates for a single transaction or a collection of
- * transactions.
- */
-typedef struct _linfo {
-	int		n;
-	DB_LOCKREQ	*reqs;
-	DBT		*objs;
-} linfo_t;
-
-#include "dbinc_auto/rep_ext.h"
-#endif	/* !_REP_H_ */
diff --git a/bdb/dbinc/shqueue.h b/bdb/dbinc/shqueue.h
deleted file mode 100644
index 47fdf12ac92..00000000000
--- a/bdb/dbinc/shqueue.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: shqueue.h,v 11.9 2002/01/11 15:52:30 bostic Exp $
- */
-
-#ifndef	_SYS_SHQUEUE_H_
-#define	_SYS_SHQUEUE_H_
-
-/*
- * This file defines three types of data structures: lists, tail queues, and
- * circular queues, similarly to the include file <sys/queue.h>.
- *
- * The difference is that this set of macros can be used for structures that
- * reside in shared memory that may be mapped at different addresses in each
- * process.  In most cases, the macros for shared structures exactly mirror
- * the normal macros, although the macro calls require an additional type
- * parameter, only used by the HEAD and ENTRY macros of the standard macros.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- */
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- * Shared list definitions.
- */
-#define	SH_LIST_HEAD(name)						\
-struct name {								\
-	ssize_t slh_first;	/* first element */			\
-}
-
-#define	SH_LIST_ENTRY							\
-struct {								\
-	ssize_t sle_next;	/* relative offset next element */	\
-	ssize_t sle_prev;	/* relative offset of prev element */	\
-}
-
-/*
- * Shared list functions.  Since we use relative offsets for pointers,
- * 0 is a valid offset.  Therefore, we use -1 to indicate end of list.
- * The macros ending in "P" return pointers without checking for end
- * of list, the others check for end of list and evaluate to either a
- * pointer or NULL.
- */
-
-#define	SH_LIST_FIRSTP(head, type)					\
-	((struct type *)(((u_int8_t *)(head)) + (head)->slh_first))
-
-#define	SH_LIST_FIRST(head, type)					\
-	((head)->slh_first == -1 ? NULL :				\
-	((struct type *)(((u_int8_t *)(head)) + (head)->slh_first)))
-
-#define	SH_LIST_NEXTP(elm, field, type)					\
-	((struct type *)(((u_int8_t *)(elm)) + (elm)->field.sle_next))
-
-#define	SH_LIST_NEXT(elm, field, type)					\
-	((elm)->field.sle_next == -1 ? NULL :				\
-	((struct type *)(((u_int8_t *)(elm)) + (elm)->field.sle_next)))
-
-#define	SH_LIST_PREV(elm, field)					\
-	((ssize_t *)(((u_int8_t *)(elm)) + (elm)->field.sle_prev))
-
-#define	SH_PTR_TO_OFF(src, dest)					\
-	((ssize_t)(((u_int8_t *)(dest)) - ((u_int8_t *)(src))))
-
-/*
- * Take the element's next pointer and calculate what the corresponding
- * Prev pointer should be -- basically it is the negation plus the offset
- * of the next field in the structure.
- */
-#define	SH_LIST_NEXT_TO_PREV(elm, field)				\
-	(-(elm)->field.sle_next + SH_PTR_TO_OFF(elm, &(elm)->field.sle_next))
-
-#define	SH_LIST_INIT(head) (head)->slh_first = -1
-
-#define	SH_LIST_INSERT_AFTER(listelm, elm, field, type) do {		\
-	if ((listelm)->field.sle_next != -1) {				\
-		(elm)->field.sle_next = SH_PTR_TO_OFF(elm,		\
-		    SH_LIST_NEXTP(listelm, field, type));		\
-		SH_LIST_NEXTP(listelm, field, type)->field.sle_prev =	\
-			SH_LIST_NEXT_TO_PREV(elm, field);		\
-	} else								\
-		(elm)->field.sle_next = -1;				\
-	(listelm)->field.sle_next = SH_PTR_TO_OFF(listelm, elm);	\
-	(elm)->field.sle_prev = SH_LIST_NEXT_TO_PREV(listelm, field);	\
-} while (0)
-
-#define	SH_LIST_INSERT_HEAD(head, elm, field, type) do {		\
-	if ((head)->slh_first != -1) {					\
-		(elm)->field.sle_next =				\
-		    (head)->slh_first - SH_PTR_TO_OFF(head, elm);	\
-		SH_LIST_FIRSTP(head, type)->field.sle_prev =		\
-			SH_LIST_NEXT_TO_PREV(elm, field);		\
-	} else								\
-		(elm)->field.sle_next = -1;				\
-	(head)->slh_first = SH_PTR_TO_OFF(head, elm);			\
-	(elm)->field.sle_prev = SH_PTR_TO_OFF(elm, &(head)->slh_first);	\
-} while (0)
-
-#define	SH_LIST_REMOVE(elm, field, type) do {				\
-	if ((elm)->field.sle_next != -1) {				\
-		SH_LIST_NEXTP(elm, field, type)->field.sle_prev =	\
-			(elm)->field.sle_prev - (elm)->field.sle_next;	\
-		*SH_LIST_PREV(elm, field) += (elm)->field.sle_next;	\
-	} else								\
-		*SH_LIST_PREV(elm, field) = -1;				\
-} while (0)
-
-/*
- * Shared tail queue definitions.
- */
-#define	SH_TAILQ_HEAD(name)						\
-struct name {								\
-	ssize_t stqh_first;	/* relative offset of first element */	\
-	ssize_t stqh_last;	/* relative offset of last's next */	\
-}
-
-#define	SH_TAILQ_ENTRY							\
-struct {								\
-	ssize_t stqe_next;	/* relative offset of next element */	\
-	ssize_t stqe_prev;	/* relative offset of prev's next */	\
-}
-
-/*
- * Shared tail queue functions.
- */
-#define	SH_TAILQ_FIRSTP(head, type)					\
-	((struct type *)((u_int8_t *)(head) + (head)->stqh_first))
-
-#define	SH_TAILQ_FIRST(head, type)					\
-	((head)->stqh_first == -1 ? NULL : SH_TAILQ_FIRSTP(head, type))
-
-#define	SH_TAILQ_NEXTP(elm, field, type)				\
-	((struct type *)((u_int8_t *)(elm) + (elm)->field.stqe_next))
-
-#define	SH_TAILQ_NEXT(elm, field, type)					\
-	((elm)->field.stqe_next == -1 ? NULL : SH_TAILQ_NEXTP(elm, field, type))
-
-#define	SH_TAILQ_PREVP(elm, field)					\
-	((ssize_t *)((u_int8_t *)(elm) + (elm)->field.stqe_prev))
-
-#define	SH_TAILQ_LAST(head)						\
-	((ssize_t *)(((u_int8_t *)(head)) + (head)->stqh_last))
-
-#define	SH_TAILQ_NEXT_TO_PREV(elm, field)				\
-	(-(elm)->field.stqe_next + SH_PTR_TO_OFF(elm, &(elm)->field.stqe_next))
-
-#define	SH_TAILQ_INIT(head) {						\
-	(head)->stqh_first = -1;					\
-	(head)->stqh_last = SH_PTR_TO_OFF(head, &(head)->stqh_first);	\
-}
-
-#define	SH_TAILQ_INSERT_HEAD(head, elm, field, type) do {		\
-	if ((head)->stqh_first != -1) {					\
-		(elm)->field.stqe_next =				\
-		    (head)->stqh_first - SH_PTR_TO_OFF(head, elm);	\
-		SH_TAILQ_FIRSTP(head, type)->field.stqe_prev =		\
-			SH_TAILQ_NEXT_TO_PREV(elm, field);		\
-	} else {							\
-		(elm)->field.stqe_next = -1;				\
-		(head)->stqh_last =					\
-		    SH_PTR_TO_OFF(head, &(elm)->field.stqe_next);	\
-	}								\
-	(head)->stqh_first = SH_PTR_TO_OFF(head, elm);			\
-	(elm)->field.stqe_prev =					\
-	    SH_PTR_TO_OFF(elm, &(head)->stqh_first);			\
-} while (0)
-
-#define	SH_TAILQ_INSERT_TAIL(head, elm, field) do {			\
-	(elm)->field.stqe_next = -1;					\
-	(elm)->field.stqe_prev =					\
-	    -SH_PTR_TO_OFF(head, elm) + (head)->stqh_last;		\
-	if ((head)->stqh_last ==					\
-	    SH_PTR_TO_OFF((head), &(head)->stqh_first))			\
-		(head)->stqh_first = SH_PTR_TO_OFF(head, elm);		\
-	else								\
-		*SH_TAILQ_LAST(head) = -(head)->stqh_last +		\
-		    SH_PTR_TO_OFF((elm), &(elm)->field.stqe_next) +	\
-		    SH_PTR_TO_OFF(head, elm);				\
-	(head)->stqh_last =						\
-	    SH_PTR_TO_OFF(head, &((elm)->field.stqe_next));		\
-} while (0)
-
-#define	SH_TAILQ_INSERT_AFTER(head, listelm, elm, field, type) do {	\
-	if ((listelm)->field.stqe_next != -1) {				\
-		(elm)->field.stqe_next = (listelm)->field.stqe_next -	\
-		    SH_PTR_TO_OFF(listelm, elm);			\
-		SH_TAILQ_NEXTP(listelm, field, type)->field.stqe_prev =	\
-		    SH_TAILQ_NEXT_TO_PREV(elm, field);			\
-	} else {							\
-		(elm)->field.stqe_next = -1;				\
-		(head)->stqh_last =					\
-		    SH_PTR_TO_OFF(head, &elm->field.stqe_next);		\
-	}								\
-	(listelm)->field.stqe_next = SH_PTR_TO_OFF(listelm, elm);	\
-	(elm)->field.stqe_prev = SH_TAILQ_NEXT_TO_PREV(listelm, field);	\
-} while (0)
-
-#define	SH_TAILQ_REMOVE(head, elm, field, type) do {			\
-	if ((elm)->field.stqe_next != -1) {				\
-		SH_TAILQ_NEXTP(elm, field, type)->field.stqe_prev =	\
-		    (elm)->field.stqe_prev +				\
-		    SH_PTR_TO_OFF(SH_TAILQ_NEXTP(elm,			\
-		    field, type), elm);					\
-		*SH_TAILQ_PREVP(elm, field) += elm->field.stqe_next;	\
-	} else {							\
-		(head)->stqh_last = (elm)->field.stqe_prev +		\
-			SH_PTR_TO_OFF(head, elm);			\
-		*SH_TAILQ_PREVP(elm, field) = -1;			\
-	}								\
-} while (0)
-
-/*
- * Shared circular queue definitions.
- */
-#define	SH_CIRCLEQ_HEAD(name)						\
-struct name {								\
-	ssize_t scqh_first;		/* first element */		\
-	ssize_t scqh_last;		/* last element */		\
-}
-
-#define	SH_CIRCLEQ_ENTRY						\
-struct {								\
-	ssize_t scqe_next;		/* next element */		\
-	ssize_t scqe_prev;		/* previous element */		\
-}
-
-/*
- * Shared circular queue functions.
- */
-#define	SH_CIRCLEQ_FIRSTP(head, type)					\
-	((struct type *)(((u_int8_t *)(head)) + (head)->scqh_first))
-
-#define	SH_CIRCLEQ_FIRST(head, type)					\
-	((head)->scqh_first == -1 ?					\
-	(void *)head : SH_CIRCLEQ_FIRSTP(head, type))
-
-#define	SH_CIRCLEQ_LASTP(head, type)					\
-	((struct type *)(((u_int8_t *)(head)) + (head)->scqh_last))
-
-#define	SH_CIRCLEQ_LAST(head, type)					\
-	((head)->scqh_last == -1 ? (void *)head : SH_CIRCLEQ_LASTP(head, type))
-
-#define	SH_CIRCLEQ_NEXTP(elm, field, type)				\
-	((struct type *)(((u_int8_t *)(elm)) + (elm)->field.scqe_next))
-
-#define	SH_CIRCLEQ_NEXT(head, elm, field, type)				\
-	((elm)->field.scqe_next == SH_PTR_TO_OFF(elm, head) ?		\
-	    (void *)head : SH_CIRCLEQ_NEXTP(elm, field, type))
-
-#define	SH_CIRCLEQ_PREVP(elm, field, type)				\
-	((struct type *)(((u_int8_t *)(elm)) + (elm)->field.scqe_prev))
-
-#define	SH_CIRCLEQ_PREV(head, elm, field, type)				\
-	((elm)->field.scqe_prev == SH_PTR_TO_OFF(elm, head) ?		\
-	    (void *)head : SH_CIRCLEQ_PREVP(elm, field, type))
-
-#define	SH_CIRCLEQ_INIT(head) {						\
-	(head)->scqh_first = 0;						\
-	(head)->scqh_last = 0;						\
-}
-
-#define	SH_CIRCLEQ_INSERT_AFTER(head, listelm, elm, field, type) do {	\
-	(elm)->field.scqe_prev = SH_PTR_TO_OFF(elm, listelm);		\
-	(elm)->field.scqe_next = (listelm)->field.scqe_next +		\
-	    (elm)->field.scqe_prev;					\
-	if (SH_CIRCLEQ_NEXTP(listelm, field, type) == (void *)head)	\
-		(head)->scqh_last = SH_PTR_TO_OFF(head, elm);		\
-	else								\
-		SH_CIRCLEQ_NEXTP(listelm,				\
-		    field, type)->field.scqe_prev =			\
-		    SH_PTR_TO_OFF(SH_CIRCLEQ_NEXTP(listelm,		\
-		    field, type), elm);					\
-	(listelm)->field.scqe_next = -(elm)->field.scqe_prev;		\
-} while (0)
-
-#define	SH_CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field, type) do {	\
-	(elm)->field.scqe_next = SH_PTR_TO_OFF(elm, listelm);		\
-	(elm)->field.scqe_prev = (elm)->field.scqe_next -		\
-		SH_CIRCLEQ_PREVP(listelm, field, type)->field.scqe_next;\
-	if (SH_CIRCLEQ_PREVP(listelm, field, type) == (void *)(head))	\
-		(head)->scqh_first = SH_PTR_TO_OFF(head, elm);		\
-	else								\
-		SH_CIRCLEQ_PREVP(listelm,				\
-		    field, type)->field.scqe_next =			\
-		    SH_PTR_TO_OFF(SH_CIRCLEQ_PREVP(listelm,		\
-		    field, type), elm);					\
-	(listelm)->field.scqe_prev = -(elm)->field.scqe_next;		\
-} while (0)
-
-#define	SH_CIRCLEQ_INSERT_HEAD(head, elm, field, type) do {		\
-	(elm)->field.scqe_prev = SH_PTR_TO_OFF(elm, head);		\
-	(elm)->field.scqe_next = (head)->scqh_first +			\
-		(elm)->field.scqe_prev;					\
-	if ((head)->scqh_last == 0)					\
-		(head)->scqh_last = -(elm)->field.scqe_prev;		\
-	else								\
-		SH_CIRCLEQ_FIRSTP(head, type)->field.scqe_prev =	\
-		    SH_PTR_TO_OFF(SH_CIRCLEQ_FIRSTP(head, type), elm);	\
-	(head)->scqh_first = -(elm)->field.scqe_prev;			\
-} while (0)
-
-#define	SH_CIRCLEQ_INSERT_TAIL(head, elm, field, type) do {		\
-	(elm)->field.scqe_next = SH_PTR_TO_OFF(elm, head);		\
-	(elm)->field.scqe_prev = (head)->scqh_last +			\
-	    (elm)->field.scqe_next;					\
-	if ((head)->scqh_first == 0)					\
-		(head)->scqh_first = -(elm)->field.scqe_next;		\
-	else								\
-		SH_CIRCLEQ_LASTP(head, type)->field.scqe_next =	\
-		    SH_PTR_TO_OFF(SH_CIRCLEQ_LASTP(head, type), elm);	\
-	(head)->scqh_last = -(elm)->field.scqe_next;			\
-} while (0)
-
-#define	SH_CIRCLEQ_REMOVE(head, elm, field, type) do {			\
-	if (SH_CIRCLEQ_NEXTP(elm, field, type) == (void *)(head))	\
-		(head)->scqh_last += (elm)->field.scqe_prev;		\
-	else								\
-		SH_CIRCLEQ_NEXTP(elm, field, type)->field.scqe_prev +=	\
-		    (elm)->field.scqe_prev;				\
-	if (SH_CIRCLEQ_PREVP(elm, field, type) == (void *)(head))	\
-		(head)->scqh_first += (elm)->field.scqe_next;		\
-	else								\
-		SH_CIRCLEQ_PREVP(elm, field, type)->field.scqe_next +=	\
-		    (elm)->field.scqe_next;				\
-} while (0)
-
-#if defined(__cplusplus)
-}
-#endif
-#endif	/* !_SYS_SHQUEUE_H_ */
diff --git a/bdb/dbinc/tcl_db.h b/bdb/dbinc/tcl_db.h
deleted file mode 100644
index 8c04d545295..00000000000
--- a/bdb/dbinc/tcl_db.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1999-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: tcl_db.h,v 11.30 2002/08/06 06:11:22 bostic Exp $
- */
-
-#ifndef _DB_TCL_DB_H_
-#define	_DB_TCL_DB_H_
-
-#define	MSG_SIZE 100		/* Message size */
-
-enum INFOTYPE {
-    I_ENV, I_DB, I_DBC, I_TXN, I_MP, I_PG, I_LOCK, I_LOGC, I_NDBM, I_MUTEX };
-
-#define	MAX_ID		8	/* Maximum number of sub-id's we need */
-#define	DBTCL_PREP	64	/* Size of txn_recover preplist */
-
-#define	DBTCL_DBM	1
-#define	DBTCL_NDBM	2
-
-typedef struct _mutex_entry {
-	union {
-		struct {
-			DB_MUTEX	real_m;
-			u_int32_t	real_val;
-		} r;
-		/*
-		 * This is here to make sure that each of the mutex structures
-		 * are 16-byte aligned, which is required on HP architectures.
-		 * The db_mutex_t structure might be >32 bytes itself, or the
-		 * real_val might push it over the 32 byte boundary.  The best
-		 * we can do is use a 48 byte boundary.
-		 */
-		char c[48];
-	} u;
-} _MUTEX_ENTRY;
-
-#define	m	u.r.real_m
-#define	val	u.r.real_val
-
-typedef struct _mutex_data {
-	DB_ENV		*env;
-	REGINFO		 reginfo;
-	_MUTEX_ENTRY	*marray;
-	size_t		 size;
-	u_int32_t	 n_mutex;
-} _MUTEX_DATA;
-
-/*
- * Why use a home grown package over the Tcl_Hash functions?
- *
- * We could have implemented the stuff below without maintaining our
- * own list manipulation, efficiently hashing it with the available
- * Tcl functions (Tcl_CreateHashEntry, Tcl_GetHashValue, etc).  I chose
- * not to do so for these reasons:
- *
- * We still need the information below.  Using the hashing only removes
- * us from needing the next/prev pointers.  We still need the structure
- * itself because we need more than one value associated with a widget.
- * We need to keep track of parent pointers for sub-widgets (like cursors)
- * so we can correctly close.  We need to keep track of individual widget's
- * id counters for any sub-widgets they may have.  We need to be able to
- * associate the name/client data outside the scope of the widget.
- *
- * So, is it better to use the hashing rather than
- * the linear list we have now?  I decided against it for the simple reason
- * that to access the structure would require two calls.  The first is
- * Tcl_FindHashEntry(table, key) and then, once we have the entry, we'd
- * have to do Tcl_GetHashValue(entry) to get the pointer of the structure.
- *
- * I believe the number of simultaneous DB widgets in existence at one time
- * is not going to be that large (more than several dozen) such that
- * linearly searching the list is not going to impact performance in a
- * noticable way.  Should performance be impacted due to the size of the
- * info list, then perhaps it is time to revisit this decision.
- */
-typedef struct dbtcl_info {
-	LIST_ENTRY(dbtcl_info) entries;
-	Tcl_Interp *i_interp;
-	char *i_name;
-	enum INFOTYPE i_type;
-	union infop {
-		DB_ENV *envp;
-		void *anyp;
-		DB *dbp;
-		DBC *dbcp;
-		DB_TXN *txnp;
-		DB_MPOOLFILE *mp;
-		DB_LOCK *lock;
-		_MUTEX_DATA *mutex;
-		DB_LOGC *logc;
-	} un;
-	union data {
-		int anydata;
-		db_pgno_t pgno;
-		u_int32_t lockid;
-	} und;
-	union data2 {
-		int anydata;
-		size_t pagesz;
-	} und2;
-	DBT i_lockobj;
-	FILE *i_err;
-	char *i_errpfx;
-
-	/* Callbacks--Tcl_Objs containing proc names */
-	Tcl_Obj *i_btcompare;
-	Tcl_Obj *i_dupcompare;
-	Tcl_Obj *i_hashproc;
-	Tcl_Obj *i_rep_send;
-	Tcl_Obj *i_second_call;
-
-	/* Environment ID for the i_rep_send callback. */
-	Tcl_Obj *i_rep_eid;
-
-	struct dbtcl_info *i_parent;
-	int	i_otherid[MAX_ID];
-} DBTCL_INFO;
-
-#define	i_anyp un.anyp
-#define	i_pagep un.anyp
-#define	i_envp un.envp
-#define	i_dbp un.dbp
-#define	i_dbcp un.dbcp
-#define	i_txnp un.txnp
-#define	i_mp un.mp
-#define	i_lock un.lock
-#define	i_mutex un.mutex
-#define	i_logc un.logc
-
-#define	i_data und.anydata
-#define	i_pgno und.pgno
-#define	i_locker und.lockid
-#define	i_data2 und2.anydata
-#define	i_pgsz und2.pagesz
-
-#define	i_envtxnid i_otherid[0]
-#define	i_envmpid i_otherid[1]
-#define	i_envlockid i_otherid[2]
-#define	i_envmutexid i_otherid[3]
-#define	i_envlogcid i_otherid[4]
-
-#define	i_mppgid  i_otherid[0]
-
-#define	i_dbdbcid i_otherid[0]
-
-extern int __debug_on, __debug_print, __debug_stop, __debug_test;
-
-typedef struct dbtcl_global {
-	LIST_HEAD(infohead, dbtcl_info) g_infohead;
-} DBTCL_GLOBAL;
-#define	__db_infohead __dbtcl_global.g_infohead
-
-extern DBTCL_GLOBAL __dbtcl_global;
-
-#define	NAME_TO_ENV(name) (DB_ENV *)_NameToPtr((name))
-#define	NAME_TO_DB(name) (DB *)_NameToPtr((name))
-#define	NAME_TO_DBC(name) (DBC *)_NameToPtr((name))
-#define	NAME_TO_TXN(name) (DB_TXN *)_NameToPtr((name))
-#define	NAME_TO_MP(name) (DB_MPOOLFILE *)_NameToPtr((name))
-#define	NAME_TO_LOCK(name) (DB_LOCK *)_NameToPtr((name))
-
-/*
- * MAKE_STAT_LIST appends a {name value} pair to a result list
- * that MUST be called 'res' that is a Tcl_Obj * in the local
- * function.  This macro also assumes a label "error" to go to
- * in the even of a Tcl error.  For stat functions this will
- * typically go before the "free" function to free the stat structure
- * returned by DB.
- */
-#define	MAKE_STAT_LIST(s,v)					\
-do {								\
-	result = _SetListElemInt(interp, res, (s), (v));	\
-	if (result != TCL_OK)					\
-		goto error;					\
-} while (0)
-
-/*
- * MAKE_STAT_LSN appends a {name {LSNfile LSNoffset}} pair to a result list
- * that MUST be called 'res' that is a Tcl_Obj * in the local
- * function.  This macro also assumes a label "error" to go to
- * in the even of a Tcl error.  For stat functions this will
- * typically go before the "free" function to free the stat structure
- * returned by DB.
- */
-#define	MAKE_STAT_LSN(s, lsn)						\
-do {									\
-	myobjc = 2;							\
-	myobjv[0] = Tcl_NewLongObj((long)(lsn)->file);			\
-	myobjv[1] = Tcl_NewLongObj((long)(lsn)->offset);		\
-	lsnlist = Tcl_NewListObj(myobjc, myobjv);			\
-	myobjc = 2;							\
-	myobjv[0] = Tcl_NewStringObj((s), strlen(s));			\
-	myobjv[1] = lsnlist;						\
-	thislist = Tcl_NewListObj(myobjc, myobjv);			\
-	result = Tcl_ListObjAppendElement(interp, res, thislist);	\
-	if (result != TCL_OK)						\
-		goto error;						\
-} while (0)
-
-/*
- * MAKE_STAT_STRLIST appends a {name string} pair to a result list
- * that MUST be called 'res' that is a Tcl_Obj * in the local
- * function.  This macro also assumes a label "error" to go to
- * in the even of a Tcl error.  For stat functions this will
- * typically go before the "free" function to free the stat structure
- * returned by DB.
- */
-#define	MAKE_STAT_STRLIST(s,s1)					\
-do {								\
-	result = _SetListElem(interp, res, (s), strlen(s),	\
-	    (s1), strlen(s1));					\
-	if (result != TCL_OK)					\
-		goto error;					\
-} while (0)
-
-/*
- * FLAG_CHECK checks that the given flag is not set yet.
- * If it is, it sets up an error message.
- */
-#define	FLAG_CHECK(flag)					\
-do {								\
-	if ((flag) != 0) {					\
-		Tcl_SetResult(interp,				\
-		    " Only 1 policy can be specified.\n",	\
-		    TCL_STATIC);				\
-		result = TCL_ERROR;				\
-		break;						\
-	}							\
-} while (0)
-
-/*
- * FLAG_CHECK2 checks that the given flag is not set yet or is
- * only set to the given allowed value.
- * If it is, it sets up an error message.
- */
-#define	FLAG_CHECK2(flag,val)					\
-do {								\
-	if (((flag) & ~(val)) != 0) {				\
-		Tcl_SetResult(interp,				\
-		    " Only 1 policy can be specified.\n",	\
-		    TCL_STATIC);				\
-		result = TCL_ERROR;				\
-		break;						\
-	}							\
-} while (0)
-
-/*
- * IS_HELP checks whether the arg we bombed on is -?, which is a help option.
- * If it is, we return TCL_OK (but leave the result set to whatever
- * Tcl_GetIndexFromObj says, which lists all the valid options.  Otherwise
- * return TCL_ERROR.
- */
-#define	IS_HELP(s)						\
-    (strcmp(Tcl_GetStringFromObj(s,NULL), "-?") == 0) ? TCL_OK : TCL_ERROR
-
-#include "dbinc_auto/tcl_ext.h"
-#endif /* !_DB_TCL_DB_H_ */
diff --git a/bdb/dbinc/txn.h b/bdb/dbinc/txn.h
deleted file mode 100644
index 31b00a6ba74..00000000000
--- a/bdb/dbinc/txn.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1996-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: txn.h,v 11.43 2002/08/29 14:22:19 margo Exp $
- */
-
-#ifndef	_TXN_H_
-#define	_TXN_H_
-
-#include "dbinc/xa.h"
-
-/* Operation parameters to the delayed commit processing code. */
-typedef enum {
-	TXN_REMOVE,		/* Remove a file. */
-	TXN_TRADE,		/* Trade lockers. */
-	TXN_TRADED		/* Already traded; downgrade lock. */
-} TXN_EVENT_T;
-
-struct __db_txnregion;	typedef struct __db_txnregion DB_TXNREGION;
-
-/*
- * !!!
- * TXN_MINIMUM = (DB_LOCK_MAXID + 1) but this makes compilers complain.
- */
-#define	TXN_MINIMUM	0x80000000
-#define	TXN_MAXIMUM	0xffffffff	/* Maximum number of txn ids. */
-#define	TXN_INVALID	0		/* Invalid transaction ID. */
-
-#define	DEF_MAX_TXNS	20		/* Default max transactions. */
-
-/*
- * Internal data maintained in shared memory for each transaction.
- */
-typedef struct __txn_detail {
-	u_int32_t txnid;		/* current transaction id
-					   used to link free list also */
-	DB_LSN	last_lsn;		/* last lsn written for this txn */
-	DB_LSN	begin_lsn;		/* lsn of begin record */
-	roff_t	parent;			/* Offset of transaction's parent. */
-
-#define	TXN_RUNNING		1
-#define	TXN_ABORTED		2
-#define	TXN_PREPARED		3
-#define	TXN_COMMITTED		4
-	u_int32_t status;		/* status of the transaction */
-#define	TXN_COLLECTED		0x1
-#define	TXN_RESTORED		0x2
-	u_int32_t flags;		/* collected during txn_recover */
-
-	SH_TAILQ_ENTRY	links;		/* free/active list */
-
-#define	TXN_XA_ABORTED		1
-#define	TXN_XA_DEADLOCKED	2
-#define	TXN_XA_ENDED		3
-#define	TXN_XA_PREPARED		4
-#define	TXN_XA_STARTED		5
-#define	TXN_XA_SUSPENDED	6
-	u_int32_t xa_status;		/* XA status */
-
-	/*
-	 * XID (xid_t) structure: because these fields are logged, the
-	 * sizes have to be explicit.
-	 */
-	u_int8_t xid[XIDDATASIZE];	/* XA global transaction id */
-	u_int32_t bqual;		/* bqual_length from XID */
-	u_int32_t gtrid;		/* gtrid_length from XID */
-	int32_t format;			/* XA format */
-} TXN_DETAIL;
-
-/*
- * DB_TXNMGR --
- *	The transaction manager encapsulates the transaction system.
- */
-struct __db_txnmgr {
-/*
- * These fields need to be protected for multi-threaded support.
- *
- * !!!
- * As this structure is allocated in per-process memory, the mutex may need
- * to be stored elsewhere on architectures unable to support mutexes in heap
- * memory, e.g., HP/UX 9.
- */
-	DB_MUTEX	*mutexp;	/* Lock list of active transactions
-					 * (including the content of each
-					 * TXN_DETAIL structure on the list).
-					 */
-					/* List of active transactions. */
-	TAILQ_HEAD(_chain, __db_txn)	txn_chain;
-	u_int32_t	 n_discards;	/* Number of txns discarded. */
-
-/* These fields are never updated after creation, and so not protected. */
-	DB_ENV		*dbenv;		/* Environment. */
-	REGINFO		 reginfo;	/* Region information. */
-};
-
-/*
- * DB_TXNREGION --
- *	The primary transaction data structure in the shared memory region.
- */
-struct __db_txnregion {
-	u_int32_t	maxtxns;	/* maximum number of active TXNs */
-	u_int32_t	last_txnid;	/* last transaction id given out */
-	u_int32_t	cur_maxid;	/* current max unused id. */
-	DB_LSN		last_ckp;	/* lsn of the last checkpoint */
-	time_t		time_ckp;	/* time of last checkpoint */
-	u_int32_t	logtype;	/* type of logging */
-	u_int32_t	locktype;	/* lock type */
-	DB_TXN_STAT	stat;		/* Statistics for txns. */
-
-#define	TXN_IN_RECOVERY	 0x01		/* environment is being recovered */
-	u_int32_t	flags;
-					/* active TXN list */
-	SH_TAILQ_HEAD(__active) active_txn;
-#ifdef HAVE_MUTEX_SYSTEM_RESOURCES
-#define	TXN_MAINT_SIZE	(sizeof(roff_t) * DB_MAX_HANDLES)
-
-	roff_t		maint_off;	/* offset of region maintenance info */
-#endif
-};
-
-/*
- * Log record types.  Note that these are *not* alphabetical.  This is
- * intentional so that we don't change the meaning of values between
- * software upgrades. EXPECTED, UNEXPECTED, IGNORE, NOTFOUND and OK
- * are used in the
- * txnlist functions.
- */
-#define	TXN_OK		0
-#define	TXN_COMMIT	1
-#define	TXN_PREPARE	2
-#define	TXN_ABORT	3
-#define	TXN_NOTFOUND	4
-#define	TXN_IGNORE	5
-#define	TXN_EXPECTED	6
-#define	TXN_UNEXPECTED	7
-
-#include "dbinc_auto/txn_auto.h"
-#include "dbinc_auto/txn_ext.h"
-#include "dbinc_auto/xa_ext.h"
-#endif /* !_TXN_H_ */
diff --git a/bdb/dbinc/xa.h b/bdb/dbinc/xa.h
deleted file mode 100644
index 64bdac8c914..00000000000
--- a/bdb/dbinc/xa.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1998-2002
- *	Sleepycat Software.  All rights reserved.
- *
- * $Id: xa.h,v 11.5 2002/01/11 15:52:30 bostic Exp $
- */
-/*
- * Start of xa.h header
- *
- * Define a symbol to prevent multiple inclusions of this header file
- */
-#ifndef	XA_H
-#define	XA_H
-
-/*
- * Transaction branch identification: XID and NULLXID:
- */
-#define	XIDDATASIZE	128		/* size in bytes */
-#define	MAXGTRIDSIZE	 64		/* maximum size in bytes of gtrid */
-#define	MAXBQUALSIZE	 64		/* maximum size in bytes of bqual */
-
-struct xid_t {
-	long formatID;			/* format identifier */
-	long gtrid_length;		/* value from 1 through 64 */
-	long bqual_length;		/* value from 1 through 64 */
-	char data[XIDDATASIZE];
-};
-typedef	struct xid_t XID;
-/*
- * A value of -1 in formatID means that the XID is null.
- */
-
-/*
- * Declarations of routines by which RMs call TMs:
- */
-extern int ax_reg __P((int, XID *, long));
-extern int ax_unreg __P((int, long));
-
-/*
- * XA Switch Data Structure
- */
-#define	RMNAMESZ	32		/* length of resource manager name, */
-					/* including the null terminator */
-#define	MAXINFOSIZE	256		/* maximum size in bytes of xa_info */
-					/* strings, including the null
-					terminator */
-struct xa_switch_t {
-	char name[RMNAMESZ];		/* name of resource manager */
-	long flags;			/* resource manager specific options */
-	long version;			/* must be 0 */
-	int (*xa_open_entry)		/* xa_open function pointer */
-	    __P((char *, int, long));
-	int (*xa_close_entry)		/* xa_close function pointer */
-	    __P((char *, int, long));
-	int (*xa_start_entry)		/* xa_start function pointer */
-	    __P((XID *, int, long));
-	int (*xa_end_entry)		/* xa_end function pointer */
-	    __P((XID *, int, long));
-	int (*xa_rollback_entry)	/* xa_rollback function pointer */
-	    __P((XID *, int, long));
-	int (*xa_prepare_entry)		/* xa_prepare function pointer */
-	    __P((XID *, int, long));
-	int (*xa_commit_entry)		/* xa_commit function pointer */
-	    __P((XID *, int, long));
-	int (*xa_recover_entry)		/* xa_recover function pointer */
-	    __P((XID *, long, int, long));
-	int (*xa_forget_entry)		/* xa_forget function pointer */
-	    __P((XID *, int, long));
-	int (*xa_complete_entry)	/* xa_complete function pointer */
-	    __P((int *, int *, int, long));
-};
-
-/*
- * Flag definitions for the RM switch
- */
-#define	TMNOFLAGS	0x00000000L	/* no resource manager features
-					selected */
-#define	TMREGISTER	0x00000001L	/* resource manager dynamically
-					registers */
-#define	TMNOMIGRATE	0x00000002L	/* resource manager does not support
-					association migration */
-#define	TMUSEASYNC	0x00000004L	/* resource manager supports
-					asynchronous operations */
-/*
- * Flag definitions for xa_ and ax_ routines
- */
-/* use TMNOFLAGGS, defined above, when not specifying other flags */
-#define	TMASYNC		0x80000000L	/* perform routine asynchronously */
-#define	TMONEPHASE	0x40000000L	/* caller is using one-phase commit
-					optimisation */
-#define	TMFAIL		0x20000000L	/* dissociates caller and marks
-					transaction branch rollback-only */
-#define	TMNOWAIT	0x10000000L	/* return if blocking condition
-					exists */
-#define	TMRESUME	0x08000000L	/* caller is resuming association with
-					suspended transaction branch */
-#define	TMSUCCESS	0x04000000L	/* dissociate caller from transaction
-					branch */
-#define	TMSUSPEND	0x02000000L	/* caller is suspending, not ending,
-					association */
-#define	TMSTARTRSCAN	0x01000000L	/* start a recovery scan */
-#define	TMENDRSCAN	0x00800000L	/* end a recovery scan */
-#define	TMMULTIPLE	0x00400000L	/* wait for any asynchronous
-					operation */
-#define	TMJOIN		0x00200000L	/* caller is joining existing
-					transaction branch */
-#define	TMMIGRATE	0x00100000L	/* caller intends to perform
-					migration */
-
-/*
- * ax_() return codes (transaction manager reports to resource manager)
- */
-#define	TM_JOIN		2		/* caller is joining existing
-					transaction branch */
-#define	TM_RESUME	1		/* caller is resuming association with
-					suspended transaction branch */
-#define	TM_OK		0		/* normal execution */
-#define	TMER_TMERR	-1		/* an error occurred in the transaction
-					manager */
-#define	TMER_INVAL	-2		/* invalid arguments were given */
-#define	TMER_PROTO	-3		/* routine invoked in an improper
-					context */
-
-/*
- * xa_() return codes (resource manager reports to transaction manager)
- */
-#define	XA_RBBASE	100		/* The inclusive lower bound of the
-					rollback codes */
-#define	XA_RBROLLBACK	XA_RBBASE	/* The rollback was caused by an
-					unspecified reason */
-#define	XA_RBCOMMFAIL	XA_RBBASE+1	/* The rollback was caused by a
-					communication failure */
-#define	XA_RBDEADLOCK	XA_RBBASE+2	/* A deadlock was detected */
-#define	XA_RBINTEGRITY	XA_RBBASE+3	/* A condition that violates the
-					integrity of the resources was
-					detected */
-#define	XA_RBOTHER	XA_RBBASE+4	/* The resource manager rolled back the
-					transaction branch for a reason not
-					on this list */
-#define	XA_RBPROTO	XA_RBBASE+5	/* A protocol error occurred in the
-					resource manager */
-#define	XA_RBTIMEOUT	XA_RBBASE+6	/* A transaction branch took too long */
-#define	XA_RBTRANSIENT	XA_RBBASE+7	/* May retry the transaction branch */
-#define	XA_RBEND	XA_RBTRANSIENT	/* The inclusive upper bound of the
-					rollback codes */
-#define	XA_NOMIGRATE	9		/* resumption must occur where
-					suspension occurred */
-#define	XA_HEURHAZ	8		/* the transaction branch may have
-					been heuristically completed */
-#define	XA_HEURCOM	7		/* the transaction branch has been
-					heuristically committed */
-#define	XA_HEURRB	6		/* the transaction branch has been
-					heuristically rolled back */
-#define	XA_HEURMIX	5		/* the transaction branch has been
-					heuristically committed and rolled
-					back */
-#define	XA_RETRY	4		/* routine returned with no effect and
-					may be re-issued */
-#define	XA_RDONLY	3		/* the transaction branch was read-only
-					and has been committed */
-#define	XA_OK		0		/* normal execution */
-#define	XAER_ASYNC	-2		/* asynchronous operation already
-					outstanding */
-#define	XAER_RMERR	-3		/* a resource manager error occurred in
-					 the transaction branch */
-#define	XAER_NOTA	-4		/* the XID is not valid */
-#define	XAER_INVAL	-5		/* invalid arguments were given */
-#define	XAER_PROTO	-6		/* routine invoked in an improper
-					context */
-#define	XAER_RMFAIL	-7		/* resource manager unavailable */
-#define	XAER_DUPID	-8		/* the XID already exists */
-#define	XAER_OUTSIDE	-9		/* resource manager doing work outside
-					transaction */
-#endif /* ifndef XA_H */
-/*
- * End of xa.h header
- */