From: Howard Chu <hyc@symas.com>
Date: Thu, 6 Mar 2014 04:04:42 +0000 (-0800)
Subject: ITS#7815 fix mdb_page_split
X-Git-Tag: OPENLDAP_REL_ENG_2_4_40~132^2~35
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0e7fba73b7e63a39fa62f532a289bef92069ba6e;p=openldap

ITS#7815 fix mdb_page_split

Was leaving cursor pointed at wrong page if the newindx was
in the right sibling page, and the parent was also split.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 5a607a4c7e..4f0081c6fc 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -7857,12 +7857,10 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
 			 */
 			if (mn.mc_pg[ptop] != mc->mc_pg[ptop] &&
 				mc->mc_ki[ptop] >= NUMKEYS(mc->mc_pg[ptop])) {
-				for (i=0; i<ptop; i++) {
+				for (i=0; i<=ptop; i++) {
 					mc->mc_pg[i] = mn.mc_pg[i];
 					mc->mc_ki[i] = mn.mc_ki[i];
 				}
-				mc->mc_pg[ptop] = mn.mc_pg[ptop];
-				mc->mc_ki[ptop] = mn.mc_ki[ptop] - 1;
 			}
 		}
 		/* return tmp page to freelist */