upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-25 17:19:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7829 more for prev commit

Browse source
This commit is contained in:
Howard Chu 2014-03-31 13:42:19 -07:00
parent ac3acc1218
commit fca18d2586
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/liblmdb/mdb.c
View file

@ -7464,7 +7464,11 @@ mdb_rebalance(MDB_cursor *mc)
minkeys = 1 + (IS_BRANCH(mn.mc_pg[mn.mc_top]));
if (PAGEFILL(mc->mc_txn->mt_env, mn.mc_pg[mn.mc_top]) >= FILL_THRESHOLD && NUMKEYS(mn.mc_pg[mn.mc_top]) > minkeys) {
rc = mdb_node_move(&mn, mc);
mc->mc_ki[mc->mc_top] = oldki;
if (mc->mc_ki[ptop] == 0) {
mc->mc_ki[mc->mc_top] = oldki;
} else {
mc->mc_ki[mc->mc_top] = oldki + 1;
}
} else {
if (mc->mc_ki[ptop] == 0) {
rc = mdb_page_merge(&mn, mc);
@ -7473,7 +7477,7 @@ mdb_rebalance(MDB_cursor *mc)
unsigned int nkeys = NUMKEYS(mn.mc_pg[mn.mc_top]);
mn.mc_ki[mn.mc_top] += mc->mc_ki[mn.mc_top] + 1;
rc = mdb_page_merge(mc, &mn);
mdb_cursor_copy(&mn, mc);
mc->mc_pg[mc->mc_top] = mn.mc_pg[mn.mc_top];
mc->mc_ki[mc->mc_top] = oldki + nkeys;
}
mc->mc_flags &= ~C_EOF;