From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 9 Nov 2015 21:21:04 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/mdb.RE/0.9' into OPENLDAP_REL_ENG_2_4
X-Git-Tag: OPENLDAP_REL_ENG_2_4_43~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=44982bf718294137ae74d6f7fbf40864baad2440;hp=b42567a8e01e75212e59e3a40b5c66dea4e917c5;p=openldap

Merge remote-tracking branch 'origin/mdb.RE/0.9' into OPENLDAP_REL_ENG_2_4
---

diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES
index fb4b482385..efb11133d3 100644
--- a/libraries/liblmdb/CHANGES
+++ b/libraries/liblmdb/CHANGES
@@ -10,6 +10,7 @@ LMDB 0.9.17 Release Engineering
 	Fix ITS#8264 cursor_del cursor tracking
 	Fix ITS#8299 mdb_del cursor tracking
 	Fix ITS#8300 mdb_del cursor tracking
+	Fix ITS#8304 mdb_del cursor tracking
 	Fix ITS#7771 fakepage cursor tracking
 	Fix ITS#7789 ensure mapsize >= pages in use
 	Fix ITS#7971 mdb_txn_renew0() new reader slots
diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 3df4a1d2f4..98c73830e0 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -7733,6 +7733,9 @@ mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
 	if ((rc = mdb_page_touch(cdst)))
 		return rc;
 
+	/* get dst page again now that we've touched it. */
+	pdst = cdst->mc_pg[cdst->mc_top];
+
 	/* Move all nodes from src to dst.
 	 */
 	j = nkeys = NUMKEYS(pdst);