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
73a5dd8c
Commit
73a5dd8c
authored
Aug 11, 2018
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix warning C4838 : conversion from 'type_1' to 'type_2' requires a narrowing conversion.
parent
9811802a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
sql/field.cc
sql/field.cc
+4
-1
sql/field.h
sql/field.h
+3
-1
No files found.
sql/field.cc
View file @
73a5dd8c
...
...
@@ -5059,7 +5059,10 @@ int Field_timestamp::store_TIME_with_warning(THD *thd, const Datetime *dt,
}
// Adjust and store the value
timeval
tv
=
{
timestamp
,
(
uint
)
l_time
->
second_part
};
timeval
tv
;
tv
.
tv_sec
=
timestamp
;
tv
.
tv_usec
=
l_time
->
second_part
;
my_timeval_trunc
(
&
tv
,
decimals
());
store_TIMEVAL
(
tv
);
...
...
sql/field.h
View file @
73a5dd8c
...
...
@@ -2756,7 +2756,9 @@ class Field_timestamp :public Field_temporal {
}
void
store_TIME
(
my_time_t
timestamp
,
ulong
sec_part
)
{
timeval
tv
=
{
timestamp
,
(
uint
)
sec_part
};
timeval
tv
;
tv
.
tv_sec
=
timestamp
;
tv
.
tv_usec
=
sec_part
;
my_timeval_trunc
(
&
tv
,
decimals
());
store_TIMEVAL
(
tv
);
}
...
...
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