|
|
@ -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; |
|
|
|
} |
|
|
|
} |
|
|
|