From: Howard Chu <hyc@openldap.org>
Date: Tue, 29 Sep 2015 17:16:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/mdb.RE/0.9'
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=94d6581b50fa2d877cf4a1e20ca6766454094ef8;hp=92d3b0c598a822311aad08ef242c105ef260b347;p=openldap

Merge remote-tracking branch 'origin/mdb.RE/0.9'
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 50d359ebb0..4a251f2e1c 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -7690,10 +7690,10 @@ mdb_rebalance(MDB_cursor *mc)
 	indx_t oldki;
 
 	if (IS_BRANCH(mc->mc_pg[mc->mc_top])) {
-		minkeys = 1;
+		minkeys = 2;
 		thresh = 1;
 	} else {
-		minkeys = 2;
+		minkeys = 1;
 		thresh = FILL_THRESHOLD;
 	}
 	DPRINTF(("rebalancing %s page %"Z"u (has %u keys, %.1f%% full)",