From: Howard Chu <hyc@openldap.org>
Date: Sun, 27 Sep 2015 21:34:22 +0000 (+0100)
Subject: ITS#8221 cleanup prev commit
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2247507bb8f57aea38e24ab236045544649624e0;p=openldap

ITS#8221 cleanup prev commit
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index d0f1deca59..b5719e7e6c 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -7898,7 +7898,6 @@ mdb_rebalance(MDB_cursor *mc)
 		minkeys = 2;
 		thresh = FILL_THRESHOLD;
 	}
-	minkeys = 1 + (IS_BRANCH(mc->mc_pg[mc->mc_top]));
 	DPRINTF(("rebalancing %s page %"Z"u (has %u keys, %.1f%% full)",
 	    IS_LEAF(mc->mc_pg[mc->mc_top]) ? "leaf" : "branch",
 	    mdb_dbg_pgno(mc->mc_pg[mc->mc_top]), NUMKEYS(mc->mc_pg[mc->mc_top]),
@@ -8038,7 +8037,6 @@ mdb_rebalance(MDB_cursor *mc)
 	 * move one key from it. Otherwise we should try to merge them.
 	 * (A branch page must never have less than 2 keys.)
 	 */
-	minkeys = 1 + (IS_BRANCH(mn.mc_pg[mn.mc_top]));
 	if (PAGEFILL(mc->mc_txn->mt_env, mn.mc_pg[mn.mc_top]) >= thresh && NUMKEYS(mn.mc_pg[mn.mc_top]) > minkeys) {
 		rc = mdb_node_move(&mn, mc);
 		if (mc->mc_ki[ptop]) {