mdbx: fix merge/rebase error (remove mm_txnid field).

This commit is contained in:
Leo Yuriev 2017-05-29 20:44:17 +03:00
parent a36b065cd9
commit d5b0e68326

View File

@ -265,7 +265,6 @@ typedef struct MDBX_meta {
/* Last used page in the datafile. /* Last used page in the datafile.
* Actually the file may be shorter if the freeDB lists the final pages. */ * Actually the file may be shorter if the freeDB lists the final pages. */
uint64_t mm_last_pg; uint64_t mm_last_pg;
volatile txnid_t mm_txnid; /* txnid that committed this page */
#define MDBX_DATASIGN_NONE 0u #define MDBX_DATASIGN_NONE 0u
#define MDBX_DATASIGN_WEAK 1u #define MDBX_DATASIGN_WEAK 1u
volatile uint64_t mm_datasync_sign; volatile uint64_t mm_datasync_sign;