1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-18286 Assertion `pagecache->cnt_for_resize_op ...

Browse Source 
This patch is also pushed in 10.4. It's pushed separately in 10.5 as there
are some additional cases in 10.5 to take care of.

When merging if there is conflicts, use this code, not the 10.4 code.
This commit is contained in:
Monty 2020-04-26 15:30:29 +03:00
parent 7cb160961c
commit b15615631f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/maria/ma_pagecache.c
View File

@ -3710,6 +3710,7 @@ restart:
{
/* block is unregistered in read_big_block */
pagecache_pthread_mutex_unlock(&pagecache->cache_lock);
dec_counter_for_resize_op(pagecache);
DBUG_PRINT("restart", ("big block fail, restarting..."));
goto restart;
}
@ -3754,6 +3755,7 @@ restart:
unreg_request(pagecache, block, 1);
dec_counter_for_resize_op(pagecache);
pagecache_pthread_mutex_unlock(&pagecache->cache_lock);
dec_counter_for_resize_op(pagecache);
DBUG_PRINT("info", ("restarting..."));
goto restart;
}
@ -4176,6 +4178,7 @@ restart:
unreg_request(pagecache, block, 1);
dec_counter_for_resize_op(pagecache);
pagecache_pthread_mutex_unlock(&pagecache->cache_lock);
dec_counter_for_resize_op(pagecache);
DBUG_PRINT("info", ("restarting..."));
goto restart;
}