mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-24 13:24:56 +08:00
ITS#7553 deinit cursor after deleting last node
This commit is contained in:
parent
bccbcd1938
commit
8a99b00acc
@ -6403,7 +6403,7 @@ mdb_rebalance(MDB_cursor *mc)
|
|||||||
static int
|
static int
|
||||||
mdb_cursor_del0(MDB_cursor *mc, MDB_node *leaf)
|
mdb_cursor_del0(MDB_cursor *mc, MDB_node *leaf)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc, eof;
|
||||||
|
|
||||||
/* add overflow pages to free list */
|
/* add overflow pages to free list */
|
||||||
if (!IS_LEAF2(mc->mc_pg[mc->mc_top]) && F_ISSET(leaf->mn_flags, F_BIGDATA)) {
|
if (!IS_LEAF2(mc->mc_pg[mc->mc_top]) && F_ISSET(leaf->mn_flags, F_BIGDATA)) {
|
||||||
@ -6421,9 +6421,12 @@ 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);
|
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--;
|
mc->mc_db->md_entries--;
|
||||||
|
eof = mc->mc_flags & C_EOF;
|
||||||
rc = mdb_rebalance(mc);
|
rc = mdb_rebalance(mc);
|
||||||
if (rc != MDB_SUCCESS)
|
if (rc != MDB_SUCCESS)
|
||||||
mc->mc_txn->mt_flags |= MDB_TXN_ERROR;
|
mc->mc_txn->mt_flags |= MDB_TXN_ERROR;
|
||||||
|
else if (eof)
|
||||||
|
mc->mc_flags &= ~C_INITIALIZED;
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user