diff options
| author | unknown <mhansson@dl145s.mysql.com> | 2007-10-09 15:25:27 +0200 |
|---|---|---|
| committer | unknown <mhansson@dl145s.mysql.com> | 2007-10-09 15:25:27 +0200 |
| commit | 69ecde861acc7bcfde2580dc827db716f727b468 (patch) | |
| tree | 4292e1961820710022a02f777072c70a3bca370a /sql/item_timefunc.h | |
| parent | f2d6508fb7d42ccfed9f05ec6a59ac21f3ec6737 (diff) | |
| parent | addc2f4720718cf9c98a02c444d2769c3d77593e (diff) | |
| download | mariadb-git-69ecde861acc7bcfde2580dc827db716f727b468.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-opt
into dl145s.mysql.com:/data0/mhansson/bug31160/my50-bug31160
sql/item_timefunc.h:
Auto merged
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"; } }; |