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 fb4b48238563dd1bb306776934c5d2710c48f7a3..efb11133d32aa9331da03f02a30193318fdf2e09 100644 (file)
--- 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 3df4a1d2f43c368de9a36863affea64eb972f207..98c73830e03dd0ec7c65c43421585c1501d852a7 100644 (file)
--- 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);