diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-04 08:24:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-04 08:24:06 +0300 |
| commit | 2c1067166d7e8a9541578220b408f1e553e23916 (patch) | |
| tree | 2ba0932f92d88e01d51393de63dda842f6daf320 /sql/sql_time.h | |
| parent | 2cf3e2ea2fca3d3613309de94d55c88dedb3831a (diff) | |
| parent | 61b2618d3aae78950f1b8dbe8d4482573c77875d (diff) | |
| download | mariadb-git-2c1067166d7e8a9541578220b408f1e553e23916.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_time.h')
| -rw-r--r-- | sql/sql_time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_time.h b/sql/sql_time.h index 91a026512c1..1832e4501ed 100644 --- a/sql/sql_time.h +++ b/sql/sql_time.h @@ -193,7 +193,7 @@ inline bool parse_date_time_format(timestamp_type format_type, { return parse_date_time_format(format_type, date_time_format->format.str, - date_time_format->format.length, + (uint) date_time_format->format.length, date_time_format); } |