From: Howard Chu <hyc@openldap.org>
Date: Wed, 15 Apr 2015 23:19:40 +0000 (+0100)
Subject: ITS#8062 also handle subcursors
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ccf4d8b385117aab1e30b46bfa0d887f621b9423;p=openldap

ITS#8062 also handle subcursors
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 36898d639f..a95c7cdb5c 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -7910,13 +7910,23 @@ mdb_rebalance(MDB_cursor *mc)
 		if (mc->mc_ki[ptop] == 0) {
 			rc = mdb_page_merge(&mn, mc);
 		} else {
+			MDB_cursor dummy;
 			oldki += NUMKEYS(mn.mc_pg[mn.mc_top]);
 			mn.mc_ki[mn.mc_top] += mc->mc_ki[mn.mc_top] + 1;
 			/* We want mdb_rebalance to find mn when doing fixups */
-			mn.mc_next = mc->mc_txn->mt_cursors[mc->mc_dbi];
-			mc->mc_txn->mt_cursors[mc->mc_dbi] = &mn;
+			if (mc->mc_flags & C_SUB) {
+				dummy.mc_next = mc->mc_txn->mt_cursors[mc->mc_dbi];
+				mc->mc_txn->mt_cursors[mc->mc_dbi] = &dummy;
+				dummy.mc_xcursor = (MDB_xcursor *)&mn;
+			} else {
+				mn.mc_next = mc->mc_txn->mt_cursors[mc->mc_dbi];
+				mc->mc_txn->mt_cursors[mc->mc_dbi] = &mn;
+			}
 			rc = mdb_page_merge(mc, &mn);
-			mc->mc_txn->mt_cursors[mc->mc_dbi] = mn.mc_next;
+			if (mc->mc_flags & C_SUB)
+				mc->mc_txn->mt_cursors[mc->mc_dbi] = dummy.mc_next;
+			else
+				mc->mc_txn->mt_cursors[mc->mc_dbi] = mn.mc_next;
 			mdb_cursor_copy(&mn, mc);
 		}
 		mc->mc_flags &= ~C_EOF;