From a90415f3011399726a16e1d71d0ef757cda69896 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 13 Nov 2015 09:25:55 +0000 Subject: [PATCH 1/2] ITS#8310 fix mdb_rebalance cursor fixup When collapsing root, must adjust entire cursor stack --- libraries/liblmdb/mdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 9af3704f78..fdfcb35109 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -7970,9 +7970,9 @@ mdb_rebalance(MDB_cursor *mc) m3 = &m2->mc_xcursor->mx_cursor; else m3 = m2; - if (m3 == mc || m3->mc_snum < mc->mc_snum) continue; + if (m3 == mc) continue; if (m3->mc_pg[0] == mp) { - for (i=0; imc_snum; i++) { + for (i=0; imc_db->md_depth; i++) { m3->mc_pg[i] = m3->mc_pg[i+1]; m3->mc_ki[i] = m3->mc_ki[i+1]; } From f6b7277e9a8622cd7a473e8107735d95d5f55d40 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 13 Nov 2015 09:28:36 +0000 Subject: [PATCH 2/2] ITS#8310 --- libraries/liblmdb/CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES index efb11133d3..d19632fe67 100644 --- a/libraries/liblmdb/CHANGES +++ b/libraries/liblmdb/CHANGES @@ -8,6 +8,7 @@ LMDB 0.9.17 Release Engineering Fix ITS#8258 rebalance/split assert Fix ITS#8263 cursor_put cursor tracking Fix ITS#8264 cursor_del cursor tracking + Fix ITS#8310 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