diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 20:00:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 21:00:41 +0100 |
| commit | 0508d327aef520d3131ff8a85ed610337149fffc (patch) | |
| tree | 7e04769f49b4aded9053adcad442fe00eb487d98 /sql/item.cc | |
| parent | bb8c82c66abddf796e8d44f817518e5ab38ae6e4 (diff) | |
| parent | 34db9958e28c325b0f708f78b7ff029de810d5ea (diff) | |
| download | mariadb-git-0508d327aef520d3131ff8a85ed610337149fffc.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 6c9496c9393..6c605dba776 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -10437,7 +10437,10 @@ bool Item_type_holder::join_types(THD *thd, Item *item) break; } default: - max_length= MY_MAX(max_length, display_length(item)); + if (real_field_type() == MYSQL_TYPE_YEAR) + max_length= MY_MAX(max_length, item->max_length); + else + max_length= MY_MAX(max_length, display_length(item)); }; maybe_null|= item->maybe_null; get_full_info(item); |