From: Howard Chu <hyc@symas.com>
Date: Sun, 22 Jun 2014 23:39:14 +0000 (-0700)
Subject: More for page_loosen
X-Git-Tag: OPENLDAP_REL_ENG_2_4_40~128^2~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aa89ca31b3a95f266cd2b354037466a2d950bc1f;p=openldap

More for page_loosen

Don't try this when working on the FreeDB. Again,
too much hassle to unkink the recursions...
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index e5bfc84996..efd15e5bea 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -7333,7 +7333,10 @@ mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
 	csrc->mc_top++;
 
 	psrc = csrc->mc_pg[csrc->mc_top];
-	if (psrc->mp_flags & P_DIRTY) {
+	/* If not operating on FreeDB, allow this page to be reused
+	 * in this txn.
+	 */
+	if ((psrc->mp_flags & P_DIRTY) && csrc->mc_dbi != FREE_DBI) {
 		mdb_page_loose(csrc->mc_txn->mt_env, psrc);
 	} else {
 		rc = mdb_midl_append(&csrc->mc_txn->mt_free_pgs, psrc->mp_pgno);