Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
496532b5
Commit
496532b5
authored
Dec 21, 2019
by
Eugene Kosov
Committed by
Marko Mäkelä
Dec 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-20950: Fix 32-bit Windows build
parent
aaaf6ceb
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
6 deletions
+9
-6
storage/innobase/include/rem0rec.h
storage/innobase/include/rem0rec.h
+1
-1
storage/innobase/include/rem0rec.ic
storage/innobase/include/rem0rec.ic
+1
-1
storage/innobase/page/page0zip.cc
storage/innobase/page/page0zip.cc
+1
-1
storage/innobase/rem/rem0rec.cc
storage/innobase/rem/rem0rec.cc
+2
-1
storage/innobase/row/row0merge.cc
storage/innobase/row/row0merge.cc
+4
-2
No files found.
storage/innobase/include/rem0rec.h
View file @
496532b5
...
...
@@ -455,7 +455,7 @@ value.
@return offset of the start of the field, SQL null flag and extern
storage flag ORed */
UNIV_INLINE
ulin
t
offset_
t
rec_2_get_field_end_info
(
/*=====================*/
const
rec_t
*
rec
,
/*!< in: record */
...
...
storage/innobase/include/rem0rec.ic
View file @
496532b5
...
...
@@ -883,7 +883,7 @@ value.
@return offset of the start of the field, SQL null flag and extern
storage flag ORed */
UNIV_INLINE
ulin
t
offset_
t
rec_2_get_field_end_info(
/*=====================*/
const rec_t* rec, /*!< in: record */
...
...
storage/innobase/page/page0zip.cc
View file @
496532b5
...
...
@@ -3171,7 +3171,7 @@ page_zip_decompress_low(
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. */
...
...
storage/innobase/rem/rem0rec.cc
View file @
496532b5
...
...
@@ -481,7 +481,8 @@ rec_init_offsets(
/* 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
{
...
...
storage/innobase/row/row0merge.cc
View file @
496532b5
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment