diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-11-02 11:09:15 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-11-02 11:09:15 +0100 |
| commit | 1c91799c6a4c9e00be87222907a6749d2bac2eff (patch) | |
| tree | b936f30a79b374c08a21084bee2ebd5b78ccc93d /sql/item_timefunc.h | |
| parent | 6ce3a06febae181f598bef357bb7c1bf08571572 (diff) | |
| parent | 46aa4c2672e2d0b1727dde5b80bd5039adbf96f6 (diff) | |
| download | mariadb-git-1c91799c6a4c9e00be87222907a6749d2bac2eff.tar.gz | |
Merge to latest mysql-next-mr
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index caf91ae5c2c..cdd74c8c601 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -892,6 +892,7 @@ public: { decimals=0; max_length=MAX_DATE_WIDTH*MY_CHARSET_BIN_MB_MAXLEN; + maybe_null= 1; } longlong val_int(); }; @@ -1046,6 +1047,11 @@ public: Item_func_last_day(Item *a) :Item_date(a) {} const char *func_name() const { return "last_day"; } bool get_date(MYSQL_TIME *res, uint fuzzy_date); + void fix_length_and_dec() + { + Item_date::fix_length_and_dec(); + maybe_null= 1; + } }; #endif /* ITEM_TIMEFUNC_INCLUDED */ |