From: Howard Chu <hyc@openldap.org>
Date: Sat, 12 Nov 2016 23:11:20 +0000 (+0000)
Subject: More for ITS#8406
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e58db7d5568c8ac91c0f1e6c64a58ba6f84b037d;p=openldap

More for ITS#8406

Revert excess cursor fixup
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 17f5a861cf..026019eb2d 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -9198,9 +9198,11 @@ mdb_cursor_del0(MDB_cursor *mc)
 					}
 					if (mc->mc_db->md_flags & MDB_DUPSORT) {
 						MDB_node *node = NODEPTR(m3->mc_pg[m3->mc_top], m3->mc_ki[m3->mc_top]);
-						if (node->mn_flags & F_DUPDATA) {
+						/* If this node is a fake page, it needs to be reinited
+						 * because its data has moved.
+						 */
+						if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA) {
 							mdb_xcursor_init1(m3, node);
-							m3->mc_xcursor->mx_cursor.mc_flags |= C_DEL;
 						}
 					}
 				}