Commit 496532b5 authored by Eugene Kosov's avatar Eugene Kosov Committed by Marko Mäkelä

MDEV-20950: Fix 32-bit Windows build

parent aaaf6ceb
...@@ -455,7 +455,7 @@ value. ...@@ -455,7 +455,7 @@ value.
@return offset of the start of the field, SQL null flag and extern @return offset of the start of the field, SQL null flag and extern
storage flag ORed */ storage flag ORed */
UNIV_INLINE UNIV_INLINE
ulint offset_t
rec_2_get_field_end_info( rec_2_get_field_end_info(
/*=====================*/ /*=====================*/
const rec_t* rec, /*!< in: record */ const rec_t* rec, /*!< in: record */
......
...@@ -883,7 +883,7 @@ value. ...@@ -883,7 +883,7 @@ value.
@return offset of the start of the field, SQL null flag and extern @return offset of the start of the field, SQL null flag and extern
storage flag ORed */ storage flag ORed */
UNIV_INLINE UNIV_INLINE
ulint offset_t
rec_2_get_field_end_info( rec_2_get_field_end_info(
/*=====================*/ /*=====================*/
const rec_t* rec, /*!< in: record */ const rec_t* rec, /*!< in: record */
......
...@@ -3171,7 +3171,7 @@ page_zip_decompress_low( ...@@ -3171,7 +3171,7 @@ page_zip_decompress_low(
offsets = static_cast<offset_t*>( offsets = static_cast<offset_t*>(
mem_heap_alloc(heap, n * sizeof(ulint))); mem_heap_alloc(heap, n * sizeof(ulint)));
*offsets = n; rec_offs_set_n_alloc(offsets, n);
} }
/* Decompress the records in heap_no order. */ /* Decompress the records in heap_no order. */
......
...@@ -481,7 +481,8 @@ rec_init_offsets( ...@@ -481,7 +481,8 @@ rec_init_offsets(
/* Old-style record: determine extra size and end offsets */ /* Old-style record: determine extra size and end offsets */
offs = REC_N_OLD_EXTRA_BYTES; offs = REC_N_OLD_EXTRA_BYTES;
if (rec_get_1byte_offs_flag(rec)) { 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; *rec_offs_base(offsets) = offs;
/* Determine offsets to fields */ /* Determine offsets to fields */
do { do {
......
...@@ -1061,8 +1061,10 @@ row_merge_heap_create( ...@@ -1061,8 +1061,10 @@ row_merge_heap_create(
*offsets2 = static_cast<offset_t*>( *offsets2 = static_cast<offset_t*>(
mem_heap_alloc(heap, i * sizeof **offsets2)); mem_heap_alloc(heap, i * sizeof **offsets2));
(*offsets1)[0] = (*offsets2)[0] = i; rec_offs_set_n_alloc(*offsets1, i);
(*offsets1)[1] = (*offsets2)[1] = dict_index_get_n_fields(index); 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); return(heap);
} }
......
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