mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-12 10:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/mdb.master'

Browse Source
This commit is contained in:
Howard Chu 2012-03-26 06:59:41 -07:00
commit 5fcc9285fb
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/libmdb/mdb.c
View File

@ -5399,6 +5399,7 @@ mdb_cursor_del0(MDB_cursor *mc, MDB_node *leaf)
memcpy(&pg, NODEDATA(leaf), sizeof(pg));
ovpages = OVPAGES(NODEDSZ(leaf), mc->mc_txn->mt_env->me_psize);
mc->mc_db->md_overflow_pages -= ovpages;
for (i=0; i<ovpages; i++) {
DPRINTF("freed ov page %zu", pg);
mdb_midl_append(&mc->mc_txn->mt_free_pgs, pg);
@ -5664,7 +5665,10 @@ newsep:
if (nflags & MDB_APPEND) {
mc->mc_pg[mc->mc_top] = rp;
mc->mc_ki[mc->mc_top] = 0;
return mdb_node_add(mc, 0, newkey, newdata, newpgno, nflags);
rc = mdb_node_add(mc, 0, newkey, newdata, newpgno, nflags);
if (rc)
return rc;
goto done;
}
if (IS_LEAF2(rp)) {
goto done;
@ -5771,10 +5775,11 @@ done:
if (!(m3->mc_flags & C_INITIALIZED))
continue;
if (new_root) {
int k;
/* root split */
for (i=m3->mc_top; i>0; i--) {
m3->mc_ki[i+1] = m3->mc_ki[i];
m3->mc_pg[i+1] = m3->mc_pg[i];
for (k=m3->mc_top; k>=0; k--) {
m3->mc_ki[k+1] = m3->mc_ki[k];
m3->mc_pg[k+1] = m3->mc_pg[k];
}
m3->mc_ki[0] = mc->mc_ki[0];
m3->mc_pg[0] = mc->mc_pg[0];