diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-10-04 10:06:33 +0200 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-10-04 10:06:33 +0200 |
| commit | f7bf6318f5621743ddb4b02b8ab499077ba563a2 (patch) | |
| tree | 58b859f865445f55d47be9cf43fa18a4de6c0007 /sql/item_timefunc.h | |
| parent | 454063c5a96ec9904485501cd3a7dd8750937249 (diff) | |
| parent | f8f021fd6ba2f654b9b6a3731bc9fea84885687c (diff) | |
| download | mariadb-git-f7bf6318f5621743ddb4b02b8ab499077ba563a2.tar.gz | |
Merge linux-st28.site:/home/martin/mysql/src/bug30942/my50-bug30942
into linux-st28.site:/home/martin/mysql/src/bug30942/my51-bug30942
sql/item_timefunc.h:
Auto merged
mysql-test/r/type_date.result:
Bug#30942: Manual merge
mysql-test/t/type_date.test:
Bug#30942: Manual merge
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 2 |
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); |