diff options
| author | monty@mysql.com <> | 2004-05-05 21:24:21 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-05 21:24:21 +0300 |
| commit | a5d8b846fafdfe723b046cd7695763f4344254c1 (patch) | |
| tree | 7237dcd91649e057a85eb3caca141f3df5892db8 /sql/item_timefunc.cc | |
| parent | d21d49a32a1689d2c486a449574e120d7a2f60c4 (diff) | |
| download | mariadb-git-a5d8b846fafdfe723b046cd7695763f4344254c1.tar.gz | |
after merge fixes
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index f22c14c925f..0c0b5265db7 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -635,7 +635,8 @@ bool make_date_time(DATE_TIME_FORMAT *format, TIME *l_time, */ static bool get_interval_info(const char *str,uint length,CHARSET_INFO *cs, - uint count, long *values, bool transform_msec) + uint count, ulonglong *values, + bool transform_msec) { const char *end=str+length; uint i; @@ -1651,7 +1652,7 @@ bool Item_date_add_interval::get_date(TIME *ltime, uint fuzzy_date) sec=((ltime->day-1)*3600*24L+ltime->hour*3600+ltime->minute*60+ ltime->second + sign* (longlong) (interval.day*3600*24L + - interval.hour*3600+interval.minute*60+ + interval.hour*LL(3600)+interval.minute*LL(60)+ interval.second))+ extra_sec; if (microseconds < 0) { |