Commit ee7d4257 authored by marko's avatar marko

branches/zip: lock_rec_validate_page(): Add another assertion

to track down Issue #289.
parent 6bfbdb2d
...@@ -170,7 +170,6 @@ command. Not tested on Windows. */ ...@@ -170,7 +170,6 @@ command. Not tested on Windows. */
#define UNIV_COMPILE_TEST_FUNCS #define UNIV_COMPILE_TEST_FUNCS
*/ */
#if 0
#define UNIV_DEBUG_VALGRIND /* Enable extra #define UNIV_DEBUG_VALGRIND /* Enable extra
Valgrind instrumentation */ Valgrind instrumentation */
#define UNIV_DEBUG_PRINT /* Enable the compilation of #define UNIV_DEBUG_PRINT /* Enable the compilation of
...@@ -181,6 +180,7 @@ command. Not tested on Windows. */ ...@@ -181,6 +180,7 @@ command. Not tested on Windows. */
debugging without UNIV_DEBUG */ debugging without UNIV_DEBUG */
#define UNIV_DEBUG /* Enable ut_ad() assertions #define UNIV_DEBUG /* Enable ut_ad() assertions
and disable UNIV_INLINE */ and disable UNIV_INLINE */
#if 0
#define UNIV_DEBUG_FILE_ACCESSES /* Debug .ibd file access #define UNIV_DEBUG_FILE_ACCESSES /* Debug .ibd file access
(field file_page_was_freed (field file_page_was_freed
in buf_page_t) */ in buf_page_t) */
......
...@@ -4736,6 +4736,7 @@ lock_rec_validate_page( ...@@ -4736,6 +4736,7 @@ lock_rec_validate_page(
ulint nth_lock = 0; ulint nth_lock = 0;
ulint nth_bit = 0; ulint nth_bit = 0;
ulint i; ulint i;
ulint zip_size;
mtr_t mtr; mtr_t mtr;
mem_heap_t* heap = NULL; mem_heap_t* heap = NULL;
ulint offsets_[REC_OFFS_NORMAL_SIZE]; ulint offsets_[REC_OFFS_NORMAL_SIZE];
...@@ -4746,8 +4747,9 @@ lock_rec_validate_page( ...@@ -4746,8 +4747,9 @@ lock_rec_validate_page(
mtr_start(&mtr); mtr_start(&mtr);
block = buf_page_get(space, fil_space_get_zip_size(space), zip_size = fil_space_get_zip_size(space);
page_no, RW_X_LATCH, &mtr); ut_ad(zip_size != ULINT_UNDEFINED);
block = buf_page_get(space, zip_size, page_no, RW_X_LATCH, &mtr);
buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK); buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
page = block->frame; page = block->frame;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment