Browse Source

MDEV-20950: Fix 32-bit Windows build

bb-10.2-MDEV-13569
Eugene Kosov 6 years ago
committed by Marko Mäkelä
parent
commit
496532b5c5
  1. 2
      storage/innobase/include/rem0rec.h
  2. 2
      storage/innobase/include/rem0rec.ic
  3. 2
      storage/innobase/page/page0zip.cc
  4. 3
      storage/innobase/rem/rem0rec.cc
  5. 6
      storage/innobase/row/row0merge.cc

2
storage/innobase/include/rem0rec.h

@ -455,7 +455,7 @@ value.
@return offset of the start of the field, SQL null flag and extern
storage flag ORed */
UNIV_INLINE
ulint
offset_t
rec_2_get_field_end_info(
/*=====================*/
const rec_t* rec, /*!< in: record */

2
storage/innobase/include/rem0rec.ic

@ -883,7 +883,7 @@ value.
@return offset of the start of the field, SQL null flag and extern
storage flag ORed */
UNIV_INLINE
ulint
offset_t
rec_2_get_field_end_info(
/*=====================*/
const rec_t* rec, /*!< in: record */

2
storage/innobase/page/page0zip.cc

@ -3171,7 +3171,7 @@ zlib_error:
offsets = static_cast<offset_t*>(
mem_heap_alloc(heap, n * sizeof(ulint)));
*offsets = n;
rec_offs_set_n_alloc(offsets, n);
}
/* Decompress the records in heap_no order. */

3
storage/innobase/rem/rem0rec.cc

@ -481,7 +481,8 @@ resolved:
/* Old-style record: determine extra size and end offsets */
offs = REC_N_OLD_EXTRA_BYTES;
if (rec_get_1byte_offs_flag(rec)) {
offs += rec_offs_n_fields(offsets);
offs += static_cast<offset_t>(
rec_offs_n_fields(offsets));
*rec_offs_base(offsets) = offs;
/* Determine offsets to fields */
do {

6
storage/innobase/row/row0merge.cc

@ -1061,8 +1061,10 @@ row_merge_heap_create(
*offsets2 = static_cast<offset_t*>(
mem_heap_alloc(heap, i * sizeof **offsets2));
(*offsets1)[0] = (*offsets2)[0] = i;
(*offsets1)[1] = (*offsets2)[1] = dict_index_get_n_fields(index);
rec_offs_set_n_alloc(*offsets1, i);
rec_offs_set_n_alloc(*offsets2, i);
rec_offs_set_n_fields(*offsets1, dict_index_get_n_fields(index));
rec_offs_set_n_fields(*offsets2, dict_index_get_n_fields(index));
return(heap);
}

Loading…
Cancel
Save