mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2021-03-03 13:55:43 +02:00
commit 71d30d01aa
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
storage/innobase/btr/btr0sea.cc
View file

@ -1265,13 +1265,24 @@ retry:
auto part = btr_search_sys.get_part(index_id, auto part = btr_search_sys.get_part(index_id,
block->page.id().space()); block->page.id().space());
part->latch.rd_lock(SRW_LOCK_CALL); dict_index_t* index = block->index;
bool is_freed = index && index->freed();
if (is_freed) {
part->latch.wr_lock(SRW_LOCK_CALL);
} else {
part->latch.rd_lock(SRW_LOCK_CALL);
}
assert_block_ahi_valid(block); assert_block_ahi_valid(block);
dict_index_t* index = block->index;
if (!index || !btr_search_enabled) { if (!index || !btr_search_enabled) {
part->latch.rd_unlock(); if (is_freed) {
part->latch.wr_unlock();
} else {
part->latch.rd_unlock();
}
return; return;
} }
@ -1290,7 +1301,9 @@ retry:
/* NOTE: The AHI fields of block must not be accessed after /* NOTE: The AHI fields of block must not be accessed after
releasing search latch, as the index page might only be s-latched! */ releasing search latch, as the index page might only be s-latched! */
part->latch.rd_unlock(); if (!is_freed) {
part->latch.rd_unlock();
}
ut_a(n_fields > 0 || n_bytes > 0); ut_a(n_fields > 0 || n_bytes > 0);
@ -1341,16 +1354,18 @@ next_rec:
mem_heap_free(heap); mem_heap_free(heap);
} }
part->latch.wr_lock(SRW_LOCK_CALL); if (!is_freed) {
part->latch.wr_lock(SRW_LOCK_CALL);
if (UNIV_UNLIKELY(!block->index)) { if (UNIV_UNLIKELY(!block->index)) {
/* Someone else has meanwhile dropped the hash index */ /* Someone else has meanwhile dropped the
hash index */
goto cleanup;
}
goto cleanup; ut_a(block->index == index);
} }
ut_a(block->index == index);
if (block->curr_n_fields != n_fields if (block->curr_n_fields != n_fields
|| block->curr_n_bytes != n_bytes) { || block->curr_n_bytes != n_bytes) {