mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-13 14:27:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#7505 fix prev commit, partial revert

Browse Source
This commit is contained in:
Howard Chu 2013-01-29 01:08:24 +00:00
parent 0b8ac92b7a
commit 9fa0c3bf31
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/liblmdb/mdb.c
View File

@ -6320,12 +6320,13 @@ mdb_rebalance(MDB_cursor *mc)
* Otherwise we should try to merge them.
*/
if (PAGEFILL(mc->mc_txn->mt_env, mn.mc_pg[mn.mc_top]) >= FILL_THRESHOLD && NUMKEYS(mn.mc_pg[mn.mc_top]) >= 2)
rc = mdb_node_move(&mn, mc);
return mdb_node_move(&mn, mc);
else {
if (mc->mc_ki[ptop] == 0)
rc = mdb_page_merge(&mn, mc);
else
rc = mdb_page_merge(mc, &mn);
mc->mc_flags &= ~C_INITIALIZED;
}
return rc;
}
@ -6353,7 +6354,6 @@ mdb_cursor_del0(MDB_cursor *mc, MDB_node *leaf)
mdb_node_del(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], mc->mc_db->md_pad);
mc->mc_db->md_entries--;
rc = mdb_rebalance(mc);
mc->mc_flags &= ~C_INITIALIZED;
if (rc != MDB_SUCCESS)
mc->mc_txn->mt_flags |= MDB_TXN_ERROR;