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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
3ab781a1
Commit
3ab781a1
authored
Jun 16, 2014
by
Leif Walsh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FT-273 fix compilation on osx
parent
97d77b9e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
ft/ft_node-serialize.cc
ft/ft_node-serialize.cc
+2
-3
No files found.
ft/ft_node-serialize.cc
View file @
3ab781a1
...
...
@@ -922,7 +922,7 @@ deserialize_child_buffer_v26(NONLEAF_CHILDINFO bnc, struct rbuf *rbuf, const tok
}
invariant
(
rbuf
->
ndone
==
rbuf
->
size
);
struct
toku_msg_buffer_key_msn_cmp_extra
extra
=
{
.
cmp
=
cmp
,
.
msg_buffer
=
&
bnc
->
msg_buffer
}
;
struct
toku_msg_buffer_key_msn_cmp_extra
extra
(
cmp
,
&
bnc
->
msg_buffer
)
;
r
=
toku
::
sort
<
int32_t
,
const
struct
toku_msg_buffer_key_msn_cmp_extra
,
toku_msg_buffer_key_msn_cmp
>::
mergesort_r
(
fresh_offsets
,
nfresh
,
extra
);
assert_zero
(
r
);
bnc
->
fresh_message_tree
.
destroy
();
...
...
@@ -1809,8 +1809,7 @@ deserialize_and_upgrade_internal_node(FTNODE node,
xids_destroy
(
&
xids
);
}
struct
toku_msg_buffer_key_msn_cmp_extra
extra
=
{
.
cmp
=
bfe
->
ft
->
cmp
,
.
msg_buffer
=
&
bnc
->
msg_buffer
};
struct
toku_msg_buffer_key_msn_cmp_extra
extra
(
bfe
->
ft
->
cmp
,
&
bnc
->
msg_buffer
);
typedef
toku
::
sort
<
int32_t
,
const
struct
toku_msg_buffer_key_msn_cmp_extra
,
toku_msg_buffer_key_msn_cmp
>
key_msn_sort
;
r
=
key_msn_sort
::
mergesort_r
(
fresh_offsets
,
nfresh
,
extra
);
assert_zero
(
r
);
...
...
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