summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authormhansson/martin@linux-st28.site <>2007-10-04 10:06:33 +0200
committermhansson/martin@linux-st28.site <>2007-10-04 10:06:33 +0200
commitec959efa717da70fd6c19ce5c6eab6c27f256c14 (patch)
tree58b859f865445f55d47be9cf43fa18a4de6c0007 /sql/item_timefunc.h
parent4d375e46e3a8373f565c1ae957166868c6c164a4 (diff)
parent028992ac694eaef99653f3efe0f74ace22828261 (diff)
downloadmariadb-git-ec959efa717da70fd6c19ce5c6eab6c27f256c14.tar.gz
Merge linux-st28.site:/home/martin/mysql/src/bug30942/my50-bug30942
into linux-st28.site:/home/martin/mysql/src/bug30942/my51-bug30942
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 32f5bcf8e52..a5aeaf59b4d 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -1005,7 +1005,7 @@ class Item_func_str_to_date :public Item_str_func
bool const_item;
public:
Item_func_str_to_date(Item *a, Item *b)
- :Item_str_func(a, b)
+ :Item_str_func(a, b), const_item(false)
{}
String *val_str(String *str);
bool get_date(MYSQL_TIME *ltime, uint fuzzy_date);