From 5d8f9ddf7e874ae63ac7821453c7368302bc8d73 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 9 Nov 2015 20:09:10 +0000 Subject: [PATCH 1/2] ITS#8304 fix page_merge Was using the pre-touch dst page pointer instead of the touched page --- libraries/liblmdb/mdb.c | 3 +++ 1 file changed, 3 insertions(+) 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); From 4e1ec79f0ed06e71a0ebfe4079fadd090f8c6f40 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 9 Nov 2015 20:11:10 +0000 Subject: [PATCH 2/2] ITS#8304 --- libraries/liblmdb/CHANGES | 1 + 1 file changed, 1 insertion(+) 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