mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bb-10.2-ext' into 10.3

Browse source
This commit is contained in:
Sergei Golubchik 2018-02-23 08:43:34 +01:00
commit 2732fcc608
63 changed files with 1137 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/my_time.h
View file

@ -117,7 +117,7 @@ longlong number_to_datetime(longlong nr, ulong sec_part, MYSQL_TIME *time_res,
ulonglong flags, int *was_cut);
static inline
longlong double_to_datetime(double nr, MYSQL_TIME *ltime, uint flags, int *cut)
longlong double_to_datetime(double nr, MYSQL_TIME *ltime, ulonglong flags, int *cut)
{
if (nr < 0 || nr > LONGLONG_MAX)
nr= (double)LONGLONG_MAX;