diff options
author | serg@serg.mylan <> | 2004-05-03 18:26:50 +0200 |
---|---|---|
committer | serg@serg.mylan <> | 2004-05-03 18:26:50 +0200 |
commit | 8c2ce22e438fa25afd4cfb078a7b69ff8c89ffb2 (patch) | |
tree | bf4ba146e6d5ba6127842067ef39513f32ee4f17 /sql | |
parent | d9bed7491f39c53d75d377e170ebca6befa32acd (diff) | |
download | mariadb-git-8c2ce22e438fa25afd4cfb078a7b69ff8c89ffb2.tar.gz |
compatibility fix. warning removed
Diffstat (limited to 'sql')
-rw-r--r-- | sql/item_timefunc.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 638bbcf5b3f..ed950a33166 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -56,7 +56,7 @@ static bool get_interval_info(const char *str,uint length,uint count, { longlong value; for (value=0; str != end && isdigit(*str) ; str++) - value=value*10LL + (long) (*str - '0'); + value=value*LL(10) + (long) (*str - '0'); values[i]= value; while (str != end && !isdigit(*str)) str++; @@ -1015,9 +1015,9 @@ bool Item_date_add_interval::get_date(TIME *ltime, bool fuzzy_date) days--; sec+=3600*LL(24); } - ltime->second=sec % 60; - ltime->minute=sec/60 % 60; - ltime->hour=sec/3600; + ltime->second= (uint)(sec % 60); + ltime->minute= (uint)(sec/60 % 60); + ltime->hour= (uint)(sec/3600); daynr= calc_daynr(ltime->year,ltime->month,1) + days; if ((ulonglong) daynr >= 3652424) // Day number from year 0 to 9999-12-31 goto null_date; |