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
6ffbfb92
Commit
6ffbfb92
authored
Feb 14, 2019
by
Oleksandr Byelkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Try to fix windows compiler warnings
parent
56a8acd2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
sql/log_event.cc
sql/log_event.cc
+7
-5
No files found.
sql/log_event.cc
View file @
6ffbfb92
...
@@ -11959,7 +11959,7 @@ bool copy_cache_to_file_wrapped(IO_CACHE *body,
...
@@ -11959,7 +11959,7 @@ bool copy_cache_to_file_wrapped(IO_CACHE *body,
contribution of non-compressed packet.
contribution of non-compressed packet.
*/
*/
my_fprintf
(
file
,
fmt_frag
,
0
);
my_fprintf
(
file
,
fmt_frag
,
0
);
if
(
my_b_copy_to_file
(
body
,
file
,
cache_size
/
2
+
1
))
if
(
my_b_copy_to_file
(
body
,
file
,
(
size_t
)
cache_size
/
2
+
1
))
goto
err
;
goto
err
;
my_fprintf
(
file
,
fmt_n_delim
,
delimiter
);
my_fprintf
(
file
,
fmt_n_delim
,
delimiter
);
...
@@ -12018,7 +12018,8 @@ bool copy_cache_to_string_wrapped(IO_CACHE *cache,
...
@@ -12018,7 +12018,8 @@ bool copy_cache_to_string_wrapped(IO_CACHE *cache,
if
(
reinit_io_cache
(
cache
,
READ_CACHE
,
0L
,
FALSE
,
FALSE
))
if
(
reinit_io_cache
(
cache
,
READ_CACHE
,
0L
,
FALSE
,
FALSE
))
goto
err
;
goto
err
;
if
(
!
(
to
->
str
=
(
char
*
)
my_malloc
(
cache
->
end_of_file
+
fmt_size
,
MYF
(
0
))))
if
(
!
(
to
->
str
=
(
char
*
)
my_malloc
((
size_t
)
cache
->
end_of_file
+
fmt_size
,
MYF
(
0
))))
{
{
perror
(
"Out of memory: can't allocate memory in "
perror
(
"Out of memory: can't allocate memory in "
"copy_cache_to_string_wrapped()."
);
"copy_cache_to_string_wrapped()."
);
...
@@ -12027,7 +12028,8 @@ bool copy_cache_to_string_wrapped(IO_CACHE *cache,
...
@@ -12027,7 +12028,8 @@ bool copy_cache_to_string_wrapped(IO_CACHE *cache,
if
(
!
do_wrap
)
if
(
!
do_wrap
)
{
{
if
(
my_b_read
(
cache
,
(
uchar
*
)
to
->
str
,
(
to
->
length
=
cache
->
end_of_file
)))
if
(
my_b_read
(
cache
,
(
uchar
*
)
to
->
str
,
(
to
->
length
=
(
size_t
)
cache
->
end_of_file
)))
goto
err
;
goto
err
;
}
}
else
if
(
4
+
sizeof
(
str_binlog
)
+
cache_size
+
sizeof
(
fmt_delim
)
>
else
if
(
4
+
sizeof
(
str_binlog
)
+
cache_size
+
sizeof
(
fmt_delim
)
>
...
@@ -12073,10 +12075,10 @@ bool copy_cache_to_string_wrapped(IO_CACHE *cache,
...
@@ -12073,10 +12075,10 @@ bool copy_cache_to_string_wrapped(IO_CACHE *cache,
char
*
str
=
to
->
str
;
char
*
str
=
to
->
str
;
str
+=
(
to
->
length
=
sprintf
(
str
,
str_binlog
));
str
+=
(
to
->
length
=
sprintf
(
str
,
str_binlog
));
if
(
my_b_read
(
cache
,
(
uchar
*
)
str
,
cache
->
end_of_file
))
if
(
my_b_read
(
cache
,
(
uchar
*
)
str
,
(
size_t
)
cache
->
end_of_file
))
goto
err
;
goto
err
;
str
+=
cache
->
end_of_file
;
str
+=
cache
->
end_of_file
;
to
->
length
+=
cache
->
end_of_file
;
to
->
length
+=
(
size_t
)
cache
->
end_of_file
;
if
(
!
is_verbose
)
if
(
!
is_verbose
)
to
->
length
+=
sprintf
(
str
,
fmt_delim
,
delimiter
);
to
->
length
+=
sprintf
(
str
,
fmt_delim
,
delimiter
);
}
}
...
...
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