diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-10 13:34:59 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-10 13:34:59 +0400 |
| commit | 03f6778d61a74bdd7d09103a16473a2a5624cf66 (patch) | |
| tree | c24fbedad48bfedde09cba9e3561b24ab35e575d /sql/item_timefunc.h | |
| parent | 1f4f425a2007c51eeee35f911a787fc7d82d977c (diff) | |
| download | mariadb-git-03f6778d61a74bdd7d09103a16473a2a5624cf66.tar.gz | |
MDEV-5298 Illegal mix of collations on timestamp
Fixed.
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 99c41961aba..76f84b88795 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -524,6 +524,11 @@ public: Item_temporal_hybrid_func(Item *a,Item *b) :Item_temporal_func(a,b) {} enum_field_types field_type() const { return cached_field_type; } + Item_result cmp_type() const + { + return cached_field_type == MYSQL_TYPE_STRING ? + STRING_RESULT : TIME_RESULT; + } const CHARSET_INFO *charset_for_protocol() const { /* |