From owner-freebsd-commit  Tue Feb 27 11:42:18 1996
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id LAA17185
          for freebsd-commit-outgoing; Tue, 27 Feb 1996 11:42:18 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id LAA17175
          for cvs-all-outgoing; Tue, 27 Feb 1996 11:42:13 -0800 (PST)
Received: (from pst@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id LAA17131
          Tue, 27 Feb 1996 11:42:02 -0800 (PST)
Date: Tue, 27 Feb 1996 11:42:02 -0800 (PST)
From: Paul Traina <pst>
Message-Id: <199602271942.LAA17131@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-lib
Subject: cvs commit:  src/lib/libc/db README changelog VERSION src/lib/libc/db/doc hash.usenix.ps libtp.usenix.ps src/lib/libc/db/mpool mpool.c src/lib/libc/db/recno rec_put.c rec_search.c rec_seq.c src/lib/libc/db/test dbtest.c src/lib/libc/db/btree bt_close.c bt_open.c bt_stack.c src/lib/libc/db/hash hash.c hash.h hash_page.c ndbm.c
Sender: owner-commit@FreeBSD.ORG
Precedence: bulk

pst         96/02/27 11:42:01

  Modified:    lib/libc/db/btree  bt_close.c bt_open.c
               lib/libc/db/hash  hash.c hash.h hash_page.c ndbm.c
               lib/libc/db/mpool  mpool.c
               lib/libc/db/recno  rec_put.c rec_search.c rec_seq.c
               lib/libc/db/test  dbtest.c
  Added:       lib/libc/db  README changelog
  Removed:     lib/libc/db  VERSION
               lib/libc/db/btree  bt_stack.c
               lib/libc/db/doc  hash.usenix.ps libtp.usenix.ps
  Log:
  Fix conflicts and merge into mainline
  
  Revision  Changes    Path
  1.3       +29 -51    src/lib/libc/db/btree/bt_close.c
  1.3       +40 -36    src/lib/libc/db/btree/bt_open.c
  1.5       +28 -28    src/lib/libc/db/hash/hash.c
  1.4       +67 -58    src/lib/libc/db/hash/hash.h
  1.3       +85 -85    src/lib/libc/db/hash/hash_page.c
  1.3       +3 -3      src/lib/libc/db/hash/ndbm.c
  1.3       +182 -253  src/lib/libc/db/mpool/mpool.c
  1.3       +42 -15    src/lib/libc/db/recno/rec_put.c
  1.3       +3 -4      src/lib/libc/db/recno/rec_search.c
  1.3       +12 -12    src/lib/libc/db/recno/rec_seq.c
  1.3       +150 -63   src/lib/libc/db/test/dbtest.c