mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 10.3 into 10.4

Browse source
This commit is contained in:
Julius Goryavsky 2021-12-25 12:13:03 +01:00
commit 681b7784b6
46 changed files with 733 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

4
storage/innobase/trx/trx0i_s.cc
View file

@ -1271,6 +1271,8 @@ static void fetch_data_into_cache_low(trx_i_s_cache_t *cache, const trx_t *trx)
static void fetch_data_into_cache(trx_i_s_cache_t *cache)
{
const trx_t *const purge_trx= purge_sys.query ? purge_sys.query->trx : NULL;
ut_ad(lock_mutex_own());
trx_i_s_cache_clear(cache);
@ -1280,7 +1282,7 @@ static void fetch_data_into_cache(trx_i_s_cache_t *cache)
trx != NULL;
trx= UT_LIST_GET_NEXT(trx_list, trx))
{
if (trx->state != TRX_STATE_NOT_STARTED && trx != purge_sys.query->trx)
if (trx != purge_trx && trx->state != TRX_STATE_NOT_STARTED)
{
mutex_enter(&trx->mutex);
if (trx->state != TRX_STATE_NOT_STARTED)