From: Howard Chu <hyc@openldap.org>
Date: Mon, 5 Sep 2011 23:15:36 +0000 (-0700)
Subject: Fix bad merge
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=513d96105de7c35ba6e4220a96630d3dd0561f91;p=openldap

Fix bad merge
---

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 73d3eaa290..7e77026bd2 100644
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -2580,17 +2580,6 @@ set1:
 				rc = cursor->mc_txn->mt_dbxs[cursor->mc_dbi].md_cmp(key, &nodekey);
 				if (rc <= 0) goto set1;
 			}
-			/* If any parents have right-sibs, search.
-			 * Otherwise, there's nothing further.
-			 */
-			for (i=0; i<cursor->mc_snum-1; i++)
-				if (cursor->mc_stack[i].mp_ki <
-					NUMKEYS(cursor->mc_stack[i].mp_page)-1)
-					break;
-			if (i == cursor->mc_snum - 1) {
-				/* There are no other pages */
-				goto set1;
-			}
 			/* If any parents have right-sibs, search.
 			 * Otherwise, there's nothing further.
 			 */