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

diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES
index efb11133d32aa9331da03f02a30193318fdf2e09..d19632fe6759d08194b83598d6ce759ac74b095e 100644 (file)
--- 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

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 9af3704f78f9e0374a112ad49775c5ead54b8651..fdfcb351097fe2ef2d17e99e2d4bf7fdf0dd22bb 100644 (file)
--- 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; i<m3->mc_snum; i++) {
+                                               for (i=0; i<mc->mc_db->md_depth; i++) {
                                                        m3->mc_pg[i] = m3->mc_pg[i+1];
                                                        m3->mc_ki[i] = m3->mc_ki[i+1];
                                                }