diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-04-22 01:44:50 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-04-22 01:44:50 -0400 |
| commit | d59cd3d22255b9a113bc83818be054405fbb7eed (patch) | |
| tree | 36003c8406a79cd9f2c610a4418525ebeafc76cb | |
| parent | Merge pull request #7655 (diff) | |
| parent | ITS#9496 fix mdb_env_open bug from #8704 (diff) | |
| download | monero-d59cd3d22255b9a113bc83818be054405fbb7eed.tar.xz | |
Merge pull request #7657
6305b90 ITS#9496 fix mdb_env_open bug from #8704 (Howard Chu)
| -rw-r--r-- | external/db_drivers/liblmdb/mdb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/external/db_drivers/liblmdb/mdb.c b/external/db_drivers/liblmdb/mdb.c index 96c741f66..6314d5775 100644 --- a/external/db_drivers/liblmdb/mdb.c +++ b/external/db_drivers/liblmdb/mdb.c @@ -4882,9 +4882,6 @@ mdb_env_open2(MDB_env *env, int prev) #endif env->me_maxpg = env->me_mapsize / env->me_psize; - if (env->me_txns) - env->me_txns->mti_txnid = meta.mm_txnid; - #if MDB_DEBUG { MDB_meta *meta = mdb_env_pick_meta(env); @@ -4984,6 +4981,9 @@ static int ESECT mdb_env_share_locks(MDB_env *env, int *excl) { int rc = 0; + MDB_meta *meta = mdb_env_pick_meta(env); + + env->me_txns->mti_txnid = meta->mm_txnid; #ifdef _WIN32 { |