diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 11:33:53 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 11:33:53 +0200 |
| commit | b5763ecd01ca9155ecce7b2f06e8a8bfce050ff9 (patch) | |
| tree | b0ce48cd6f43a11d7465312dfe14552a8e4f8e3b /sql/item_timefunc.cc | |
| parent | 375256bae71e3f20d4498990610842b2976b6187 (diff) | |
| parent | 45531949ae115f2ba7b9450cc2386653483211ba (diff) | |
| download | mariadb-git-b5763ecd01ca9155ecce7b2f06e8a8bfce050ff9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 4b072e253c5..cccb5a4b37f 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -453,7 +453,7 @@ static bool extract_date_time(THD *thd, DATE_TIME_FORMAT *format, { ErrConvString err(val_begin, length, &my_charset_bin); make_truncated_value_warning(thd, Sql_condition::WARN_LEVEL_WARN, - &err, cached_timestamp_type, NullS); + &err, cached_timestamp_type, 0, NullS); break; } } while (++val != val_end); |