diff options
Diffstat (limited to 'innobase/page')
-rw-r--r-- | innobase/page/page0cur.c | 9 | ||||
-rw-r--r-- | innobase/page/page0page.c | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/innobase/page/page0cur.c b/innobase/page/page0cur.c index 0b233b4dd72..85beffbcc94 100644 --- a/innobase/page/page0cur.c +++ b/innobase/page/page0cur.c @@ -510,14 +510,14 @@ page_cur_parse_insert_rec( mtr_t* mtr) /* in: mtr or NULL */ { ulint extra_info_yes; - ulint offset; + ulint offset = 0; /* remove warning */ ulint origin_offset; ulint end_seg_len; ulint mismatch_index; rec_t* cursor_rec; byte buf1[1024]; byte* buf; - ulint info_bits; + ulint info_bits = 0; /* remove warning */ page_cur_t cursor; if (!is_short) { @@ -835,9 +835,9 @@ page_copy_rec_list_end_to_created_page( rec_t* rec, /* in: first record to copy */ mtr_t* mtr) /* in: mtr */ { - page_dir_slot_t* slot; + page_dir_slot_t* slot = 0; /* remove warning */ byte* heap_top; - rec_t* insert_rec; + rec_t* insert_rec = 0; /* remove warning */ rec_t* prev_rec; ulint count; ulint n_recs; @@ -882,6 +882,7 @@ page_copy_rec_list_end_to_created_page( slot_index = 0; n_recs = 0; + /* should be do ... until, comment by Jani */ while (rec != page_get_supremum_rec(page)) { insert_rec = rec_copy(heap_top, rec); diff --git a/innobase/page/page0page.c b/innobase/page/page0page.c index a75a7279fb5..bf8af45a00a 100644 --- a/innobase/page/page0page.c +++ b/innobase/page/page0page.c @@ -210,7 +210,7 @@ page_parse_create( /*==============*/ /* out: end of log record or NULL */ byte* ptr, /* in: buffer */ - byte* end_ptr,/* in: buffer end */ + byte* end_ptr __attribute__((unused)), /* in: buffer end */ page_t* page, /* in: page or NULL */ mtr_t* mtr) /* in: mtr or NULL */ { @@ -283,7 +283,7 @@ page_create( tuple = dtuple_create(heap, 1); field = dtuple_get_nth_field(tuple, 0); - dfield_set_data(field, "infimum", strlen("infimum") + 1); + dfield_set_data(field,(char *) "infimum", strlen("infimum") + 1); dtype_set(dfield_get_type(field), DATA_VARCHAR, DATA_ENGLISH, 20, 0); /* Set the corresponding physical record to its place in the page @@ -305,7 +305,7 @@ page_create( tuple = dtuple_create(heap, 1); field = dtuple_get_nth_field(tuple, 0); - dfield_set_data(field, "supremum", strlen("supremum") + 1); + dfield_set_data(field, (char *) "supremum", strlen("supremum") + 1); dtype_set(dfield_get_type(field), DATA_VARCHAR, DATA_ENGLISH, 20, 0); supremum_rec = rec_convert_dtuple_to_rec(heap_top, tuple); |