mirror of
https://github.com/isar/libmdbx.git
synced 2025-01-21 21:58:20 +08:00
mdbx: fix mdbx_cursors_eot()
.
Change-Id: I6021ff019f25110db96f9ef351d31a1f48b76c18
This commit is contained in:
parent
f6ff075335
commit
8fce97dca9
@ -6005,13 +6005,11 @@ static void mdbx_cursors_eot(MDBX_txn *txn, const bool merge) {
|
|||||||
if (stage == MDBX_MC_WAIT4EOT /* Cursor was closed by user */)
|
if (stage == MDBX_MC_WAIT4EOT /* Cursor was closed by user */)
|
||||||
mc->mc_signature = stage /* Promote closed state to parent txn */;
|
mc->mc_signature = stage /* Promote closed state to parent txn */;
|
||||||
else if (merge) {
|
else if (merge) {
|
||||||
/* Preserve changes from nested to parent txn */
|
/* Restore pointers to parent txn */
|
||||||
mc->mc_next = bk->mc_next;
|
mc->mc_next = bk->mc_next;
|
||||||
mc->mc_backup = bk->mc_backup;
|
mc->mc_backup = bk->mc_backup;
|
||||||
mc->mc_txn = bk->mc_txn;
|
mc->mc_txn = bk->mc_txn;
|
||||||
*bk->mc_db = *mc->mc_db;
|
|
||||||
mc->mc_db = bk->mc_db;
|
mc->mc_db = bk->mc_db;
|
||||||
*bk->mc_dbistate = *mc->mc_dbistate;
|
|
||||||
mc->mc_dbistate = bk->mc_dbistate;
|
mc->mc_dbistate = bk->mc_dbistate;
|
||||||
if (mx) {
|
if (mx) {
|
||||||
if (mx != bk->mc_xcursor) {
|
if (mx != bk->mc_xcursor) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user