- set cachesize without a dbenv, the default is far too small.

- db: don't return EACCES on db->close w/o environment.
- unify cachesize configuration, with (or without) a dbenv.
- comments regarding unsupported (yet) db-4.1.17 functionality.

CVS patchset: 5674
CVS date: 2002/08/26 18:56:11

1 files changed, 3 insertions, 5 deletions

diff --git a/macros.in b/macros.in
index 5c07fca38..565c40a9f 100644
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.121 2002/08/22 19:21:14 jbj Exp $
+# $Id: macros.in,v 1.122 2002/08/26 18:56:12 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -366,8 +366,8 @@ package or when debugging this package. \
 #   token	works?	Berkeley db flag or value
 #==================================================
 #---------------------- DBENV->open parameters and tunable values:
-#   mp_mmapsize=8Mb	DBENV->set_mp_mmapsize
-#   mp_size=512Kb	DBENV->set_cachesize
+#   mmapsize=16Mb	DBENV->set_mp_mmapsize
+#   cachesize=1Mb	DBENV->set_cachesize, DB->set_cachesize
 #---------------------- DBENV->open and DB->open common bits:
 #   create		DB_CREATE
 #   thread	???	DB_THREAD	(useless w/o posix mutexes on linux)
@@ -386,7 +386,6 @@ package or when debugging this package. \
 #   lockdown	???	DB_LOCKDOWN
 #   shared	+++	DB_SYSTEM_MEM
 #---------------------- DB->open parameters and tunable values:
-#   cachesize=512Kb +++	DB->set_cachesize	(meaningless if mp_size is used)
 #   pagesize=512 +++	DB->set_pagesize
 #---------------------- DB->open bits:
 #   excl	???	DB_EXCL
@@ -418,7 +417,6 @@ package or when debugging this package. \
 # Use a CDB database model for concurrent access.
 %__dbi_cdb			create cdb mpool mp_mmapsize=16Mb mp_size=1Mb
 
-# XXX The "traditional" rpmdb shared/exclusive fcntl(2) lock on Packages model:
 %__dbi_other			%{?_tmppath:tmpdir=%{_tmppath}} %{?__dbi_cdb}
 
 # Note: adding nofsync here speeds up --rebuilddb a lot.