From: Howard Chu <hyc@symas.com>
Date: Tue, 16 Apr 2013 19:05:03 +0000 (-0700)
Subject: ITS#7574 blind fix
X-Git-Tag: OPENLDAP_REL_ENG_2_4_36~69^2~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aca6c0889768eed2bfb55d0ed22faa92d7cf947a;p=openldap

ITS#7574 blind fix

Fix 227329c8e1fb818548f1936f5dc1349ffd733523, don't persist
the MDB_VALID bit in db.md_flags.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index ad2cec29ec..f25222c9ff 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -1844,7 +1844,8 @@ mdb_txn_renew0(MDB_txn *txn)
 	/* Copy the DB info and flags */
 	memcpy(txn->mt_dbs, env->me_metas[txn->mt_toggle]->mm_dbs, 2 * sizeof(MDB_db));
 	for (i=2; i<txn->mt_numdbs; i++) {
-		txn->mt_dbs[i].md_flags = x = env->me_dbflags[i];
+		x = env->me_dbflags[i];
+		txn->mt_dbs[i].md_flags = x & PERSISTENT_FLAGS;
 		txn->mt_dbflags[i] = (x & MDB_VALID) ? DB_VALID|DB_STALE : 0;
 	}
 	txn->mt_dbflags[0] = txn->mt_dbflags[1] = DB_VALID;