diff options
| author | unknown <mhansson@dl145s.mysql.com> | 2007-10-09 15:23:16 +0200 |
|---|---|---|
| committer | unknown <mhansson@dl145s.mysql.com> | 2007-10-09 15:23:16 +0200 |
| commit | addc2f4720718cf9c98a02c444d2769c3d77593e (patch) | |
| tree | 6934e3cf420b3820d5492090a20ed298a84a9336 /sql | |
| parent | 071e55af0db16f3f8d2b703433e8ed8b0edcfa99 (diff) | |
| parent | ae4141ed75124cc4bbae5fa22662ef0e7f00b122 (diff) | |
| download | mariadb-git-addc2f4720718cf9c98a02c444d2769c3d77593e.tar.gz | |
Merge martin@mhansson.mysql.internal:/home/martin/mysql/src/bug31160/my50-bug31160
into dl145s.mysql.com:/data0/mhansson/bug31160/my50-bug31160
Diffstat (limited to 'sql')
| -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 8e925a0156f..3e860017d89 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"; } }; |