From 4e51e58c2376e4f649db5118b137a77a71a0d8a7 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 8 Apr 2010 16:07:58 +0300 Subject: [PATCH] Eliminate "thread" BDB option - this is not something that users should be tweaking - its never been enabled, leave it that way for now --- lib/backend/db3.c | 2 -- lib/backend/dbconfig.c | 2 -- macros.in | 1 - 3 files changed, 5 deletions(-) diff --git a/lib/backend/db3.c b/lib/backend/db3.c index 9f6348e..788ab7e 100644 --- a/lib/backend/db3.c +++ b/lib/backend/db3.c @@ -479,7 +479,6 @@ int dbiOpen(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip) } else { dbi->dbi_eflags |= DB_JOINENV; dbi->dbi_oeflags &= ~DB_CREATE; - dbi->dbi_oeflags &= ~DB_THREAD; /* ... but, unless DB_PRIVATE is used, skip DBENV. */ dbi->dbi_use_dbenv = 0; } @@ -503,7 +502,6 @@ int dbiOpen(rpmdb rpmdb, rpmTag rpmtag, dbiIndex * dbip) } else { dbi->dbi_eflags |= DB_JOINENV; dbi->dbi_oeflags &= ~DB_CREATE; - dbi->dbi_oeflags &= ~DB_THREAD; } } dbf = _free(dbf); diff --git a/lib/backend/dbconfig.c b/lib/backend/dbconfig.c index ab59def..bfde9ab 100644 --- a/lib/backend/dbconfig.c +++ b/lib/backend/dbconfig.c @@ -23,8 +23,6 @@ static const struct poptOption rdbOptions[] = { { "create", 0,POPT_BIT_SET, &staticdbi.dbi_oeflags, DB_CREATE, NULL, NULL }, - { "thread", 0,POPT_BIT_SET, &staticdbi.dbi_oeflags, DB_THREAD, - NULL, NULL }, { "force", 0,POPT_BIT_SET, &staticdbi.dbi_eflags, DB_FORCE, NULL, NULL }, diff --git a/macros.in b/macros.in index 8890c7e..f0c7120 100644 --- a/macros.in +++ b/macros.in @@ -539,7 +539,6 @@ print (t)\ # 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) #---------------------- DBENV->open bits: # joinenv DB_JOIN_ENV # cdb +++ DB_INIT_CDB -- 2.7.4