diff options
| author | unknown <sanja@montyprogram.com> | 2013-11-11 23:40:53 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-11-11 23:40:53 +0200 |
| commit | 55de9b0468c65b7277b7ca6978f4e01c01af1206 (patch) | |
| tree | a98623574e326aea7b4b16d768947ac24dc80962 /sql/item_timefunc.h | |
| parent | 383de0fd1f7b855276f5bec37f38de6dbf70e938 (diff) | |
| parent | 3a75900b91ffb4d49396d8f83e0b55b392e83a2a (diff) | |
| download | mariadb-git-55de9b0468c65b7277b7ca6978f4e01c01af1206.tar.gz | |
merge 10-base->10.0
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 0b5ac95525a..99c41961aba 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -1062,9 +1062,13 @@ class Item_func_str_to_date :public Item_temporal_hybrid_func { 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_hybrid_func(a, b), const_item(false) + :Item_temporal_hybrid_func(a, b), const_item(false), + internal_charset(NULL) {} bool get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date); const char *func_name() const { return "str_to_date"; } |