nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7656

Browse Source 
5fe22ac ITS#9496 fix mdb_env_open bug from #8704 (hyc)
This commit is contained in:
luigi1111 2021-04-22 01:43:18 -04:00
commit 215976beba
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
external/db_drivers/liblmdb/mdb.c vendored
View File

@ -4882,9 +4882,6 @@ mdb_env_open2(MDB_env *env, int prev)
#endif #endif
env->me_maxpg = env->me_mapsize / env->me_psize; env->me_maxpg = env->me_mapsize / env->me_psize;
if (env->me_txns)
env->me_txns->mti_txnid = meta.mm_txnid;
#if MDB_DEBUG #if MDB_DEBUG
{ {
MDB_meta *meta = mdb_env_pick_meta(env); MDB_meta *meta = mdb_env_pick_meta(env);
@ -4984,6 +4981,9 @@ static int ESECT
mdb_env_share_locks(MDB_env *env, int *excl) mdb_env_share_locks(MDB_env *env, int *excl)
{ {
int rc = 0; int rc = 0;
MDB_meta *meta = mdb_env_pick_meta(env);
env->me_txns->mti_txnid = meta->mm_txnid;
#ifdef _WIN32 #ifdef _WIN32
{ {