From: Howard Chu <hyc@symas.com>
Date: Thu, 2 May 2013 05:43:35 +0000 (-0700)
Subject: Allow reading freelist while working on it
X-Git-Tag: OPENLDAP_REL_ENG_2_4_36~68^2~13
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=21da623bf40dc21f89c3172c523d094075e0824b;p=openldap

Allow reading freelist while working on it

The circular dependency issues appear to have been resolved.
Still, need to watch closely, maybe revert this change if
problems arise.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 09fc3e29e8..7d4383f886 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -1398,6 +1398,7 @@ none:
 
 				mdb_cursor_init(&m2, txn, FREE_DBI, NULL);
 				do {
+#ifdef MDB_PARANOID	/* Seems like we can ignore this now */
 					/* If on freelist, don't try to read more. If what we have
 					 * right now isn't enough just use new pages.
 					 * TODO: get all of this working. Many circular dependencies...
@@ -1406,6 +1407,7 @@ none:
 						retry = 0;
 						readit = 0;
 					}
+#endif
 					if (readit) {
 						MDB_val key, data;
 						pgno_t *idl, *mop2;