Merge remote branch 'origin/mdb.master'

This commit is contained in:
Howard Chu 2012-03-28 10:45:06 -07:00
commit 7ff8baf1d3

View File

@ -4232,7 +4232,6 @@ more:
(dkey.mv_size & 1) + (data->mv_size & 1);
}
mdb_node_del(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], 0);
mc->mc_db->md_entries--;
do_sub = 1;
rdata = &xdata;
xdata.mv_size = fp->mp_upper;
@ -4307,7 +4306,6 @@ more:
mp->mp_ptrs[i] = fp->mp_ptrs[i] + offset;
}
mdb_node_del(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], 0);
mc->mc_db->md_entries--;
do_sub = 1;
goto new_sub;
}