mdbx: Merge branch 'devel'.

Change-Id: I96fc12a4b3e7191a19aa7620ca4d36cf192ff15c
This commit is contained in:
Leo Yuriev 2016-11-13 13:05:45 +03:00
commit a26a38be2d
2 changed files with 5 additions and 2 deletions

View File

@ -2,6 +2,7 @@ MDBX
Add MDB_PREV_MULTIPLE
Fix MDB_CP_COMPACT (ITS#8209)
Add error MDB_PROBLEM, replace some MDB_CORRUPTED
Backport fixes for ITS#8406
LMDB 0.9.19 Release Engineering
Fix mdb_env_cwalk cursor init (ITS#8424)

6
mdb.c
View File

@ -8518,9 +8518,11 @@ mdb_cursor_del0(MDB_cursor *mc)
}
if (mc->mc_db->md_flags & MDB_DUPSORT) {
MDB_node *node = NODEPTR(m3->mc_pg[m3->mc_top], m3->mc_ki[m3->mc_top]);
if (node->mn_flags & F_DUPDATA) {
/* If this node is a fake page, it needs to be reinited
* because its data has moved.
*/
if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA) {
mdb_xcursor_init1(m3, node);
m3->mc_xcursor->mx_cursor.mc_flags |= C_DEL;
}
}
}