Commit 1c8162be authored by marko's avatar marko

branches/zip: Apply some white-space changes from branches/innodb+.

parent 2fe45fb9
...@@ -390,8 +390,8 @@ btr_cur_search_to_nth_level( ...@@ -390,8 +390,8 @@ btr_cur_search_to_nth_level(
return; return;
} }
#endif #endif /* BTR_CUR_HASH_ADAPT */
#endif #endif /* BTR_CUR_ADAPT */
btr_cur_n_non_sea++; btr_cur_n_non_sea++;
/* If the hash search did not succeed, do binary search down the /* If the hash search did not succeed, do binary search down the
...@@ -464,8 +464,7 @@ retry_page_get: ...@@ -464,8 +464,7 @@ retry_page_get:
block = buf_page_get_gen(space, zip_size, page_no, block = buf_page_get_gen(space, zip_size, page_no,
rw_latch, guess, buf_mode, rw_latch, guess, buf_mode,
__FILE__, __LINE__, __FILE__, __LINE__, mtr);
mtr);
if (block == NULL) { if (block == NULL) {
/* This must be a search to perform an insert; /* This must be a search to perform an insert;
try insert to the insert buffer */ try insert to the insert buffer */
...@@ -686,8 +685,7 @@ btr_cur_open_at_index_side( ...@@ -686,8 +685,7 @@ btr_cur_open_at_index_side(
page_t* page; page_t* page;
block = buf_page_get_gen(space, zip_size, page_no, block = buf_page_get_gen(space, zip_size, page_no,
RW_NO_LATCH, NULL, BUF_GET, RW_NO_LATCH, NULL, BUF_GET,
__FILE__, __LINE__, __FILE__, __LINE__, mtr);
mtr);
page = buf_block_get_frame(block); page = buf_block_get_frame(block);
ut_ad(0 == ut_dulint_cmp(index->id, ut_ad(0 == ut_dulint_cmp(index->id,
btr_page_get_index_id(page))); btr_page_get_index_id(page)));
...@@ -806,8 +804,7 @@ btr_cur_open_at_rnd_pos( ...@@ -806,8 +804,7 @@ btr_cur_open_at_rnd_pos(
block = buf_page_get_gen(space, zip_size, page_no, block = buf_page_get_gen(space, zip_size, page_no,
RW_NO_LATCH, NULL, BUF_GET, RW_NO_LATCH, NULL, BUF_GET,
__FILE__, __LINE__, __FILE__, __LINE__, mtr);
mtr);
page = buf_block_get_frame(block); page = buf_block_get_frame(block);
ut_ad(0 == ut_dulint_cmp(index->id, ut_ad(0 == ut_dulint_cmp(index->id,
btr_page_get_index_id(page))); btr_page_get_index_id(page)));
......
...@@ -632,7 +632,7 @@ loop: ...@@ -632,7 +632,7 @@ loop:
if (!buf_lru_switched_on_innodb_mon) { if (!buf_lru_switched_on_innodb_mon) {
/* Over 67 % of the buffer pool is occupied by lock /* Over 67 % of the buffer pool is occupied by lock
heaps or the adaptive hash index. This may be a memory heaps or the adaptive hash index. This may be a memory
leak! */ leak! */
......
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