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

branches/zip: ibuf_merge_or_delete_for_page(): Check that the changes would

Browse source 
be merged to a leaf page.
This commit is contained in:
marko 2008-09-24 09:30:32 +00:00
parent a10e1a5e64
commit e6aeb98755
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ibuf/ibuf0ibuf.c
View file

@ -3299,7 +3299,8 @@ ibuf_merge_or_delete_for_page(
page_zip = buf_block_get_page_zip(block); page_zip = buf_block_get_page_zip(block);
if (UNIV_UNLIKELY(fil_page_get_type(block->frame) if (UNIV_UNLIKELY(fil_page_get_type(block->frame)
!= FIL_PAGE_INDEX)) { != FIL_PAGE_INDEX)
|| UNIV_UNLIKELY(!page_is_leaf(block->frame))) {
corruption_noticed = TRUE; corruption_noticed = TRUE;
@ -3326,7 +3327,7 @@ ibuf_merge_or_delete_for_page(
"InnoDB: buffer records to page n:o %lu" "InnoDB: buffer records to page n:o %lu"
" though the page\n" " though the page\n"
"InnoDB: type is %lu, which is" "InnoDB: type is %lu, which is"
" not an index page!\n" " not an index leaf page!\n"
"InnoDB: We try to resolve the problem" "InnoDB: We try to resolve the problem"
" by skipping the insert buffer\n" " by skipping the insert buffer\n"
"InnoDB: merge for this page." "InnoDB: merge for this page."