diff options
author | Timothy Smith <timothy.smith@sun.com> | 2009-02-07 16:50:31 +0100 |
---|---|---|
committer | Timothy Smith <timothy.smith@sun.com> | 2009-02-07 16:50:31 +0100 |
commit | 2515ce79e892baf55eaf5bf8b476d472cb38444f (patch) | |
tree | fe32eeab98707f29a552790b3a6b5d159a351338 /sql/item_timefunc.h | |
parent | 401a83cac31d7d9feb5cc2ab797a89b8076eb6ef (diff) | |
parent | 67bd15a554d80f8dcd20d5ba873721288fa0a8ca (diff) | |
download | mariadb-git-2515ce79e892baf55eaf5bf8b476d472cb38444f.tar.gz |
Auto-merge up from 5.0
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r-- | sql/item_timefunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 94b02d1eaf6..9e3c2e8c89f 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -419,6 +419,7 @@ public: { return save_time_in_field(field); } + longlong val_int() { return val_int_from_decimal(); } bool result_as_longlong() { return TRUE; } }; |