diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-08 14:30:35 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-08 14:30:35 +0400 |
| commit | d79d0c4045f5b93ded001ca6b963727b3362cd15 (patch) | |
| tree | 5645bdbdae6cd831846798f18815e11e21d60c2e /sql/item_timefunc.h | |
| parent | a588de1fe8d6b376cabb67581374078c7a7d38d7 (diff) | |
| parent | a33bb001445d2576f15437d9392bc70736ab419a (diff) | |
| download | mariadb-git-d79d0c4045f5b93ded001ca6b963727b3362cd15.tar.gz | |
merge 5.3 -> 5.5
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 1f686f34367..c54490f45af 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -1029,9 +1029,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, ulonglong fuzzy_date); const char *func_name() const { return "str_to_date"; } |