Simplify the dbenv->open() flags shuffle

- We always create an environment. If we dont have permissions to create
  or join a shared environment, we use a private environment. Instead
  of trying to figure out what to do beforehand, retry dbenv->open()
  with different flags to see if it succeeds. This eliminates some
  potential races when others might create/remove the environment
  while we're pondering about appropriate flags.
- Lose the "create" bdb config option, this is something we always
  want to decide internally.
- Remove "force" bdb config option, DB_FORCE is dbenv->remove() option
  and its value clashes with DB_CREATE...

1 files changed, 2 insertions, 4 deletions

diff --git a/macros.in b/macros.in
index 0cc83b906..927f240e1 100644
--- a/macros.in
+++ b/macros.in
@@ -537,8 +537,6 @@ print (t)\
 #---------------------- DBENV->open parameters and tunable values:
 #   mmapsize=16Mb	DBENV->set_mp_mmapsize
 #   cachesize=1Mb	DBENV->set_cachesize, DB->set_cachesize
-#---------------------- DBENV->open and DB->open common bits:
-#   create		DB_CREATE
 #---------------------- DBENV->open bits:
 #   cdb		+++	DB_INIT_CDB
 #   txn		???	DB_INIT_TXN
@@ -568,12 +566,12 @@ print (t)\
 #
 
 # XXX Use transactions and logs for rpmdb durability (no clue yet):
-#%__dbi_other			create txn log \
+#%__dbi_other			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 mp_mmapsize=16Mb mp_size=1Mb
+%__dbi_cdb			cdb mp_mmapsize=16Mb mp_size=1Mb
 
 %__dbi_other			%{?__dbi_cdb}