diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-10-09 15:00:06 +0200 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-10-09 15:00:06 +0200 |
| commit | 05903b333f1a783d2f4b1cdc94a1476c23b882b9 (patch) | |
| tree | 1c7bd467dff8a8298074b2fbb68f09769cfe428f /sql/item_timefunc.h | |
| parent | bd8e7fee1f260b6f5b9b39c67bb6e701eace3cae (diff) | |
| parent | ae4141ed75124cc4bbae5fa22662ef0e7f00b122 (diff) | |
| download | mariadb-git-05903b333f1a783d2f4b1cdc94a1476c23b882b9.tar.gz | |
Merge linux-st28.site:/home/martin/mysql/src/bug31160/my50-bug31160
into linux-st28.site:/home/martin/mysql/src/bug31160/my51-bug31160
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
sql/item_timefunc.h:
Auto merged
mysql-test/t/func_time.test:
SCCS 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 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"; } }; |