From: Howard Chu <hyc@openldap.org>
Date: Sat, 21 Nov 2015 17:58:49 +0000 (+0000)
Subject: ITS#8316 more for 60c34d14ec3ceb0762d620eef77db73dd1e911dc
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f3e38565e4af652b3da60e805ac465b76eb1d84b;p=openldap

ITS#8316 more for 60c34d14ec3ceb0762d620eef77db73dd1e911dc
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 7f896daa09..1f12db3947 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -7979,7 +7979,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]) {
+			} else if (m3->mc_pg[top-1] == csrc->mc_pg[top-1] &&
+				m3->mc_ki[top-1] > csrc->mc_ki[top-1]) {
 				m3->mc_ki[top-1]--;
 			}
 		}