diff options
| author | mhansson@dl145s.mysql.com <> | 2007-10-09 15:25:27 +0200 |
|---|---|---|
| committer | mhansson@dl145s.mysql.com <> | 2007-10-09 15:25:27 +0200 |
| commit | 8e2a56ea9d56e8cda1831df0d5ecaf6fa16695ff (patch) | |
| tree | 4292e1961820710022a02f777072c70a3bca370a /sql/item_timefunc.h | |
| parent | ddc67f087a9ef90b6612b162a9649ce5cb06de4b (diff) | |
| parent | c7ff50622ce3f0436215aa5e793ec574d7295a3d (diff) | |
| download | mariadb-git-8e2a56ea9d56e8cda1831df0d5ecaf6fa16695ff.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-opt
into dl145s.mysql.com:/data0/mhansson/bug31160/my50-bug31160
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index cb69bd200e6..76a6fd19619 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -962,7 +962,10 @@ class Item_func_maketime :public Item_str_timefunc { public: Item_func_maketime(Item *a, Item *b, Item *c) - :Item_str_timefunc(a, b ,c) {} + :Item_str_timefunc(a, b, c) + { + maybe_null= TRUE; + } String *val_str(String *str); const char *func_name() const { return "maketime"; } }; |