diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-18 11:38:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-18 11:38:07 +0300 |
| commit | e17a282da94b3d85d24688d78583308421998a5d (patch) | |
| tree | eefd039db287faae22e56d5ab570cdaee52a9805 /sql/item_timefunc.cc | |
| parent | 3060f9afd6c0f838f0fafede7243d6b4f8325baa (diff) | |
| parent | 4cfef2a5a4157269244923637032c21ff67b0161 (diff) | |
| download | mariadb-git-e17a282da94b3d85d24688d78583308421998a5d.tar.gz | |
Merge bb-10.2-ext into 10.3
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 6af25c67d91..c05f3f5c7be 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2408,7 +2408,7 @@ String *Item_char_typecast::copy(String *str, CHARSET_INFO *strcs) if (copier.copy_with_warn(cast_cs, &tmp_value, strcs, str->ptr(), str->length(), cast_length)) { - null_value= 1; // In strict mode: malformed data or could not convert + null_value= 1; // EOM return 0; } check_truncation_with_warn(str, copier.source_end_pos() - str->ptr()); |