Commit 66312acc authored by calvin's avatar calvin

branches/zip: Fix the compile errors in btr/btr0cur.c for Windows

build. It is part of Mantis issue#18. Reviewed by Marko.
parent 7ec866a5
...@@ -3593,7 +3593,7 @@ btr_push_update_extern_fields( ...@@ -3593,7 +3593,7 @@ btr_push_update_extern_fields(
InnoDB writes a longer prefix of externally InnoDB writes a longer prefix of externally
stored columns, so that column prefixes stored columns, so that column prefixes
in secondary indexes can be reconstructed. */ in secondary indexes can be reconstructed. */
dfield_set_data(field, dfield_get_data(field) dfield_set_data(field, (byte*) dfield_get_data(field)
+ dfield_get_len(field) + dfield_get_len(field)
- BTR_EXTERN_FIELD_REF_SIZE, - BTR_EXTERN_FIELD_REF_SIZE,
BTR_EXTERN_FIELD_REF_SIZE); BTR_EXTERN_FIELD_REF_SIZE);
...@@ -4411,13 +4411,13 @@ btr_copy_zblob_prefix( ...@@ -4411,13 +4411,13 @@ btr_copy_zblob_prefix(
ulint page_no,/* in: page number of the first BLOB page */ ulint page_no,/* in: page number of the first BLOB page */
ulint offset) /* in: offset on the first BLOB page */ ulint offset) /* in: offset on the first BLOB page */
{ {
ulint page_type = FIL_PAGE_TYPE_ZBLOB;
ut_ad(ut_is_2pow(zip_size)); ut_ad(ut_is_2pow(zip_size));
ut_ad(zip_size >= PAGE_ZIP_MIN_SIZE); ut_ad(zip_size >= PAGE_ZIP_MIN_SIZE);
ut_ad(zip_size <= UNIV_PAGE_SIZE); ut_ad(zip_size <= UNIV_PAGE_SIZE);
ut_ad(space_id); ut_ad(space_id);
ulint page_type = FIL_PAGE_TYPE_ZBLOB;
for (;;) { for (;;) {
buf_page_t* bpage; buf_page_t* bpage;
int err; int err;
......
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