A little bit of sanity to dbiNew()

- lose the hysterical dbi_use_env condition and usedbenv option
  this is always enabled
- ensure mpool is always initialized, lose the config option (this
  is a mandatory BDB subsystem, not a bleeping configurable)
- let pagesize be what it is even when no configuration is present
- avoid overriding dbi_mmapsize and dbi_cachesize if set in the configuratio
- these are all per-environment, not per-dbi settings but for now...

1 files changed, 2 insertions, 4 deletions

diff --git a/macros.in b/macros.in
index b6fe25bcb..8890c7e0a 100644
--- a/macros.in
+++ b/macros.in
@@ -542,7 +542,6 @@ print (t)\
 #   thread	???	DB_THREAD	(useless w/o posix mutexes on linux)
 #---------------------- DBENV->open bits:
 #   joinenv		DB_JOIN_ENV
-#   mpool		DB_INIT_MPOOL
 #   cdb		+++	DB_INIT_CDB
 #   txn		???	DB_INIT_TXN
 #   log		???	DB_INIT_LOG
@@ -565,19 +564,18 @@ print (t)\
 #   ht_dup	+++	(hash only) DB_DUP
 #   ht_dupsort	+++	(hash only) DB_DUPSORT
 #----------------------- rpmdb specific configuration:
-#   usedbenv		(always on) Use db3 environment?
 #   verify		(db3 only) Verify Packages db after RW close?
 #   lockdbfd		(always on for Packages) Use fcntl(2) locking ?
 #   nofsync		Disable fsync(2) call performed after db3 writes?
 #
 
 # XXX Use transactions and logs for rpmdb durability (no clue yet):
-#%__dbi_other			create joinenv mpool txn log \
+#%__dbi_other			create joinenv txn log \
 #				mp_mmapsize=8Mb mp_size=512Kb
 
 # Use a CDB database model for concurrent access.
 # XXX Add "private" here for legacy interoperation transiting to glibc+nptl.
-%__dbi_cdb			create cdb mpool mp_mmapsize=16Mb mp_size=1Mb
+%__dbi_cdb			create cdb mp_mmapsize=16Mb mp_size=1Mb
 
 %__dbi_other			%{?__dbi_cdb}