Commit c36871e5 authored by Vasil Dimov's avatar Vasil Dimov

(btr0btr.c:1900) Bug#55227 Fix compiler warnings in innodb with gcc 4.6

parent d3c82da6
...@@ -1897,7 +1897,6 @@ btr_page_split_and_insert( ...@@ -1897,7 +1897,6 @@ btr_page_split_and_insert(
buf_block_t* left_block; buf_block_t* left_block;
buf_block_t* right_block; buf_block_t* right_block;
buf_block_t* insert_block; buf_block_t* insert_block;
page_t* insert_page;
page_cur_t* page_cursor; page_cur_t* page_cursor;
rec_t* first_rec; rec_t* first_rec;
byte* buf = 0; /* remove warning */ byte* buf = 0; /* remove warning */
...@@ -2155,8 +2154,6 @@ btr_page_split_and_insert( ...@@ -2155,8 +2154,6 @@ btr_page_split_and_insert(
insert_block = right_block; insert_block = right_block;
} }
insert_page = buf_block_get_frame(insert_block);
/* 7. Reposition the cursor for insert and try insertion */ /* 7. Reposition the cursor for insert and try insertion */
page_cursor = btr_cur_get_page_cur(cursor); page_cursor = btr_cur_get_page_cur(cursor);
...@@ -2168,8 +2165,12 @@ btr_page_split_and_insert( ...@@ -2168,8 +2165,12 @@ btr_page_split_and_insert(
#ifdef UNIV_ZIP_DEBUG #ifdef UNIV_ZIP_DEBUG
{ {
page_t* insert_page
= buf_block_get_frame(insert_block);
page_zip_des_t* insert_page_zip page_zip_des_t* insert_page_zip
= buf_block_get_page_zip(insert_block); = buf_block_get_page_zip(insert_block);
ut_a(!insert_page_zip ut_a(!insert_page_zip
|| page_zip_validate(insert_page_zip, insert_page)); || page_zip_validate(insert_page_zip, insert_page));
} }
......
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