From aff123ba113728a254339c07560b7d98c88f30a6 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 5 Jun 2013 16:13:43 -0700 Subject: [PATCH] ITS#7594 more for subDB cursor fix --- libraries/liblmdb/mdb.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 0e14320..0be43fe 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -5413,8 +5413,18 @@ mdb_cursor_del(MDB_cursor *mc, unsigned int flags) void *db = NODEDATA(leaf); memcpy(db, &mc->mc_xcursor->mx_db, sizeof(MDB_db)); } else { + MDB_cursor *m2; /* shrink fake page */ mdb_node_shrink(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); + leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); + mc->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(leaf); + /* fix other sub-DB cursors pointed at this fake page */ + for (m2 = mc->mc_txn->mt_cursors[mc->mc_dbi]; m2; m2=m2->mc_next) { + if (m2 == mc || m2->mc_snum < mc->mc_snum) continue; + if (m2->mc_pg[mc->mc_top] == mc->mc_pg[mc->mc_top] && + m2->mc_ki[mc->mc_top] == mc->mc_ki[mc->mc_top]) + m2->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(leaf); + } } mc->mc_db->md_entries--; return rc;