mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-14409 Assertion `page_rec_is_leaf(rec)' failed in lock_rec_validate_page

Browse source 
lock_rec_queue_validate(): Assert page_rec_is_leaf(rec), except when
the record is a page infimum or supremum.

lock_rec_validate_page(): Relax the assertion that failed.
The assertion was reachable when the record lock bitmap was empty.

lock_rec_insert_check_and_lock(): Assert page_is_leaf().
This commit is contained in:
Marko Mäkelä 2018-11-26 10:10:49 +02:00
parent 3728b11f87
commit a81fceafb1
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
storage/innobase/lock/lock0lock.cc
View file

@ -5485,6 +5485,8 @@ lock_rec_queue_validate(
goto func_exit;
}
ut_ad(page_rec_is_leaf(rec));
if (index == NULL) {
/* Nothing we can do */
@ -5646,11 +5648,13 @@ loop:
if (!sync_check_find(SYNC_FSP))
for (i = nth_bit; i < lock_rec_get_n_bits(lock); i++) {
if (i == 1 || lock_rec_get_nth_bit(lock, i)) {
if (i == PAGE_HEAP_NO_SUPREMUM
|| lock_rec_get_nth_bit(lock, i)) {
rec = page_find_rec_with_heap_no(block->frame, i);
ut_a(rec);
ut_ad(page_rec_is_leaf(rec));
ut_ad(!lock_rec_get_nth_bit(lock, i)
|| page_rec_is_leaf(rec));
offsets = rec_get_offsets(rec, lock->index, offsets,
true, ULINT_UNDEFINED,
&heap);
@ -5886,7 +5890,7 @@ lock_rec_insert_check_and_lock(
{
ut_ad(block->frame == page_align(rec));
ut_ad(!dict_index_is_online_ddl(index)
|| dict_index_is_clust(index)
|| index->is_primary()
|| (flags & BTR_CREATE_FLAG));
ut_ad(mtr->is_named_space(index->space));
@ -5895,7 +5899,8 @@ lock_rec_insert_check_and_lock(
return(DB_SUCCESS);
}
ut_ad(!dict_table_is_temporary(index->table));
ut_ad(!index->table->is_temporary());
ut_ad(page_is_leaf(block->frame));
dberr_t err;
lock_t* lock;