database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

merge 10-base->10.0

Browse Source
This commit is contained in:
unknown
2013-11-11 23:40:53 +02:00
parent 383de0fd1f 3a75900b91
commit 55de9b0468
50 changed files with 617 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/item_timefunc.h
View File

@@ -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"; }