From: Howard Chu <hyc@openldap.org>
Date: Thu, 19 Nov 2015 20:04:16 +0000 (+0000)
Subject: ITS#8316 cursor fixup in page_merge
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=60c34d14ec3ceb0762d620eef77db73dd1e911dc;p=openldap

ITS#8316 cursor fixup in page_merge

Deleting the merged page requires bumping down other ki's
of the page's parent.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 99da353d7d..9c0c95e91a 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -7963,6 +7963,8 @@ mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
 				m3->mc_pg[top] = pdst;
 				m3->mc_ki[top] += nkeys;
 				m3->mc_ki[top-1] = cdst->mc_ki[top-1];
+			} else if (m3->mc_ki[top-1] > csrc->mc_ki[top-1]) {
+				m3->mc_ki[top-1]--;
 			}
 		}
 	}