diff options
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index a50443ad348..6eaeec0804f 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1467,7 +1467,9 @@ void Item_temporal_func::fix_length_and_dec() (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE); collation.set(field_type() == MYSQL_TYPE_STRING ? default_charset() : &my_charset_numeric, - DERIVATION_NUMERIC, MY_REPERTOIRE_ASCII); + field_type() == MYSQL_TYPE_STRING ? + DERIVATION_COERCIBLE : DERIVATION_NUMERIC, + MY_REPERTOIRE_ASCII); fix_char_length(char_length); } |