-
Alexander Barkov authored
This change is a backport from 10.0 to 5.5 for: 1. The full patch for: MDEV-4841 Wrong character set of ADDTIME() and DATE_ADD() 9adb6e99 2. A small fragment of: MDEV-5298 Illegal mix of collations on timestamp 03f6778d which overrides Item_temporal_hybrid_func::cmp_type(), and adds a new line into cache_temporal_4265.result.
2f6fede8