mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 22:12:30 +01:00
branches/innodb+: Merge revisions 3498:3519 from branches/zip:
------------------------------------------------------------------------ r3514 | marko | 2008-12-12 13:39:40 +0200 (Fri, 12 Dec 2008) | 3 lines branches/zip: btr_cur_search_to_nth_level(): Remove a duplicate check for (rw_latch != RW_NO_LATCH) around debug code. ------------------------------------------------------------------------ Other branches/zip revisions in that range were backported from branches/innodb+ and were thus not merged back to branches/innodb+.
This commit is contained in:
parent
f13f514c65
commit
364910b122
1 changed files with 3 additions and 7 deletions
|
@ -623,17 +623,13 @@ retry_page_get:
|
|||
block->check_index_page_at_flush = TRUE;
|
||||
page = buf_block_get_frame(block);
|
||||
|
||||
#ifdef UNIV_ZIP_DEBUG
|
||||
if (rw_latch != RW_NO_LATCH) {
|
||||
const page_zip_des_t* page_zip;
|
||||
|
||||
page_zip = buf_block_get_page_zip(block);
|
||||
|
||||
#ifdef UNIV_ZIP_DEBUG
|
||||
const page_zip_des_t* page_zip
|
||||
= buf_block_get_page_zip(block);
|
||||
ut_a(!page_zip || page_zip_validate(page_zip, page));
|
||||
}
|
||||
#endif /* UNIV_ZIP_DEBUG */
|
||||
|
||||
if (rw_latch != RW_NO_LATCH) {
|
||||
buf_block_dbg_add_level(block, SYNC_TREE_NODE);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue