diff options
| author | unknown <mhansson@dl145s.mysql.com> | 2007-10-04 13:58:34 +0200 |
|---|---|---|
| committer | unknown <mhansson@dl145s.mysql.com> | 2007-10-04 13:58:34 +0200 |
| commit | 68f4fab0895666a43b0d4b89203387870fb498c2 (patch) | |
| tree | b351266e3b4a405e7795732d5184e2edf6fb3ea0 /sql/item_timefunc.h | |
| parent | 6356f16196be6492f7b18cc06df53075a2b14203 (diff) | |
| parent | f7bf6318f5621743ddb4b02b8ab499077ba563a2 (diff) | |
| download | mariadb-git-68f4fab0895666a43b0d4b89203387870fb498c2.tar.gz | |
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into dl145s.mysql.com:/data0/mhansson/bug30942/my51-bug30942
sql/item_timefunc.h:
Auto merged
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 36556269d07..6d3a236b791 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -1007,7 +1007,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); |