diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-08 14:18:16 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-08 14:18:16 +0400 |
| commit | a33bb001445d2576f15437d9392bc70736ab419a (patch) | |
| tree | 878fd523c8bcdac7fdfe7af8800bc28c92969fe1 /sql/item_timefunc.h | |
| parent | 5ce11d8b4ca2a57968656925a69ed8114d5374f6 (diff) | |
| download | mariadb-git-a33bb001445d2576f15437d9392bc70736ab419a.tar.gz | |
MDEV-4842 STR_TO_DATE does not work with UCS2/UTF16/UTF32
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 20365d4f25d..bc048e1ff64 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -998,9 +998,13 @@ class Item_func_str_to_date :public Item_temporal_func enum_field_types cached_field_type; timestamp_type cached_timestamp_type; bool const_item; + String subject_converter; + String format_converter; + CHARSET_INFO *internal_charset; public: Item_func_str_to_date(Item *a, Item *b) - :Item_temporal_func(a, b), const_item(false) + :Item_temporal_func(a, b), const_item(false), + internal_charset(NULL) {} bool get_date(MYSQL_TIME *ltime, uint fuzzy_date); const char *func_name() const { return "str_to_date"; } |