diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-17 14:03:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-17 14:03:51 +0300 |
| commit | fe949504f0894686d434c6fbdac25efeb965253d (patch) | |
| tree | 11bf92cdbb0c0454453c5e920d0a833cb35ecf4e /sql/item_timefunc.cc | |
| parent | ca906fb27361f615a1c21d5ae61c312d9ab0dd87 (diff) | |
| parent | 72c838b9fc3e5e9495d3c8e363ba85304b9db39a (diff) | |
| download | mariadb-git-fe949504f0894686d434c6fbdac25efeb965253d.tar.gz | |
Merge 10.2 into bb-10.2-ext
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 e0ee85dd5a2..525ad051031 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()); |