database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixing size_t to uint conversion failure on Windows

Browse Source 
Since MDEV-15091, the "lengh" parameter to str_to_time()
and str_to_datetime() is of type size_t rather than uint.
Fixing Time(), Temporal_with_date() and Datetime() constructors accordingly.
This commit is contained in:
Alexander Barkov
2018-08-11 06:24:36 +04:00
parent 597dcbda3f
commit 2966c1e422
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_type.h
View File

@ -700,7 +700,7 @@ public:
make_from_item(&warn, item, opt); make_from_item(&warn, item, opt);
} }
Time(int *warn, const MYSQL_TIME *from, long curdays); Time(int *warn, const MYSQL_TIME *from, long curdays);
Time(int *warn, const char *str, uint len, CHARSET_INFO *cs, Time(int *warn, const char *str, size_t len, CHARSET_INFO *cs,
const Options opt) const Options opt)
{ {
MYSQL_TIME_STATUS status; MYSQL_TIME_STATUS status;
@ -856,7 +856,7 @@ protected:
if (nr.to_datetime(this, flags, warn)) if (nr.to_datetime(this, flags, warn))
time_type= MYSQL_TIMESTAMP_NONE; time_type= MYSQL_TIMESTAMP_NONE;
} }
Temporal_with_date(int *warn, const char *str, uint len, CHARSET_INFO *cs, Temporal_with_date(int *warn, const char *str, size_t len, CHARSET_INFO *cs,
sql_mode_t flags) sql_mode_t flags)
{ {
DBUG_ASSERT((flags & TIME_TIME_ONLY) == 0); DBUG_ASSERT((flags & TIME_TIME_ONLY) == 0);
@ -1022,7 +1022,7 @@ public:
{ {
set_zero_time(this, MYSQL_TIMESTAMP_DATETIME); set_zero_time(this, MYSQL_TIMESTAMP_DATETIME);
} }
Datetime(int *warn, const char *str, uint len, CHARSET_INFO *cs, Datetime(int *warn, const char *str, size_t len, CHARSET_INFO *cs,
sql_mode_t flags) sql_mode_t flags)
:Temporal_with_date(warn, str, len, cs, flags) :Temporal_with_date(warn, str, len, cs, flags)
{ {