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

Hopefully really final fix of Bug#11766591 59733: Possible deadlock

Browse Source 
when buffered changes are to be discarded

sync_thread_add_level(level = SYNC_IBUF_INDEX_TREE): Relax a too strict
condition that the thread must not be holding locks below SYNC_FSP_PAGE.
It is perfectly valid to hold any latch above SYNC_IBUF_INDEX_TREE when
acquiring the insert buffer tree latch.
This commit is contained in:
Marko Mäkelä 2011-09-14 15:39:36 +03:00
parent 3cd36cb0b8
commit 59e022c10d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/innodb_plugin/sync/sync0sync.c
View File

@ -1258,8 +1258,7 @@ sync_thread_add_level(
break; break;
case SYNC_IBUF_INDEX_TREE: case SYNC_IBUF_INDEX_TREE:
if (sync_thread_levels_contain(array, SYNC_FSP)) { if (sync_thread_levels_contain(array, SYNC_FSP)) {
ut_a(sync_thread_levels_g( ut_a(sync_thread_levels_g(array, level - 1, TRUE));
array, SYNC_FSP_PAGE - 1, TRUE));
} else { } else {
ut_a(sync_thread_levels_g( ut_a(sync_thread_levels_g(
array, SYNC_IBUF_TREE_NODE - 1, TRUE)); array, SYNC_IBUF_TREE_NODE - 1, TRUE));