mirror of
https://github.com/isar/libmdbx.git
synced 2025-01-20 10:58:21 +08:00
mdbx: merge branch master
into the devel
.
Change-Id: Iab3a0502577f6557e3f8fccc89df49aee372416e
This commit is contained in:
commit
0620ec2f2e
@ -7167,7 +7167,6 @@ int mdbx_txn_begin_ex(MDBX_env *env, MDBX_txn *parent, MDBX_txn_flags_t flags,
|
|||||||
mdbx_free(txn);
|
mdbx_free(txn);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
txn->tw.dirtyroom = parent->tw.dirtyroom;
|
|
||||||
|
|
||||||
/* Move loose pages to reclaimed list */
|
/* Move loose pages to reclaimed list */
|
||||||
if (parent->tw.loose_count) {
|
if (parent->tw.loose_count) {
|
||||||
@ -7190,6 +7189,7 @@ int mdbx_txn_begin_ex(MDBX_env *env, MDBX_txn *parent, MDBX_txn_flags_t flags,
|
|||||||
#endif /* MDBX_ENABLE_REFUND */
|
#endif /* MDBX_ENABLE_REFUND */
|
||||||
mdbx_tassert(parent, mdbx_dirtylist_check(parent));
|
mdbx_tassert(parent, mdbx_dirtylist_check(parent));
|
||||||
}
|
}
|
||||||
|
txn->tw.dirtyroom = parent->tw.dirtyroom;
|
||||||
|
|
||||||
mdbx_dpl_sort(parent->tw.dirtylist);
|
mdbx_dpl_sort(parent->tw.dirtylist);
|
||||||
if (parent->tw.spill_pages)
|
if (parent->tw.spill_pages)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user