diff options
| author | unknown <mhansson@dl145s.mysql.com> | 2007-10-09 15:27:38 +0200 |
|---|---|---|
| committer | unknown <mhansson@dl145s.mysql.com> | 2007-10-09 15:27:38 +0200 |
| commit | 91415775968a5605cbae69fcddcd9936d54b3f81 (patch) | |
| tree | 7fe7add533ba41dc80b9dab5fdf0399edacd0e19 /sql/item_timefunc.h | |
| parent | 177d3c3c6aa28a8707988ccdd165c3affb986bf7 (diff) | |
| parent | 05903b333f1a783d2f4b1cdc94a1476c23b882b9 (diff) | |
| download | mariadb-git-91415775968a5605cbae69fcddcd9936d54b3f81.tar.gz | |
Merge martin@mhansson.mysql.internal:/home/martin/mysql/src/bug31160/my51-bug31160
into dl145s.mysql.com:/data0/mhansson/bug31160/my51-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 36556269d07..3376960aaf9 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -938,7 +938,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"; } }; |