diff options
| author | George Hazan <ghazan@miranda.im> | 2017-12-18 17:13:08 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-12-18 17:13:14 +0300 |
| commit | 6c4280ab334cab2d629c3e057090ae98a29c3e49 (patch) | |
| tree | d11340a501d05ee87791ff7a9c8ff12e312ed0e9 /plugins/Dbx_mdb/src/mdbx/mdbx.c | |
| parent | fd20e23e548b5ff7f80fe97c0c9b7d94ff040482 (diff) | |
merge with recent libmdbx fix
Diffstat (limited to 'plugins/Dbx_mdb/src/mdbx/mdbx.c')
| -rw-r--r-- | plugins/Dbx_mdb/src/mdbx/mdbx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/Dbx_mdb/src/mdbx/mdbx.c b/plugins/Dbx_mdb/src/mdbx/mdbx.c index 6e4182cfb2..e306208095 100644 --- a/plugins/Dbx_mdb/src/mdbx/mdbx.c +++ b/plugins/Dbx_mdb/src/mdbx/mdbx.c @@ -2537,6 +2537,7 @@ static int mdbx_txn_renew0(MDBX_txn *txn, unsigned flags) { r->mr_txnid = snap; mdbx_jitter4testing(false); mdbx_assert(env, r->mr_pid == mdbx_getpid()); + mdbx_assert(env, r->mr_tid == mdbx_thread_self()); mdbx_assert(env, r->mr_txnid == snap); mdbx_coherent_barrier(); env->me_lck->mti_readers_refresh_flag = true; @@ -4650,6 +4651,7 @@ LIBMDBX_API int mdbx_env_set_geometry(MDBX_env *env, intptr_t size_lower, if (unlikely(rc != MDBX_SUCCESS)) goto bailout; } + env->me_sync_pending += env->me_psize; mdbx_meta_set_txnid(env, &meta, mdbx_meta_txnid_stable(env, head) + 1); rc = mdbx_sync_locked(env, env->me_flags, &meta); } |