diff options
| author | unknown <mhansson@dl145s.mysql.com> | 2007-10-09 15:35:03 +0200 |
|---|---|---|
| committer | unknown <mhansson@dl145s.mysql.com> | 2007-10-09 15:35:03 +0200 |
| commit | 09ddd95132bab10413017366e1359301471688b8 (patch) | |
| tree | 2130a0d2a025cda5a2b6655a3a263214c3550079 /sql/item_timefunc.h | |
| parent | 4f0fc8d7d5bea5c4b33022a667e4bf9425b899fd (diff) | |
| parent | 91415775968a5605cbae69fcddcd9936d54b3f81 (diff) | |
| download | mariadb-git-09ddd95132bab10413017366e1359301471688b8.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-opt
into dl145s.mysql.com:/data0/mhansson/bug31160/my51-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 6d3a236b791..4c335ca85b1 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"; } }; |