diff options
| author | unknown <dlenev@mysql.com> | 2005-04-25 11:26:20 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-04-25 11:26:20 +0400 |
| commit | 20cf8f82eefbc4db26ec50aef4f602c991811397 (patch) | |
| tree | 440aca57f2ce736bcdce783b7e11b6ee564520f6 | |
| parent | ffb64880b7b5381d29341ec7d5cb07da2e81b77f (diff) | |
| parent | b0d05dd9a33306ac411328a94c990e57f6251b17 (diff) | |
| download | mariadb-git-20cf8f82eefbc4db26ec50aef4f602c991811397.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg10040
| -rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 6715930bc61..23cd9c7ced2 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -800,14 +800,14 @@ static bool calc_time_diff(TIME *l_time1, TIME *l_time2, int l_sign, We should check it before calc_time_diff call. */ if (l_time1->time_type == MYSQL_TIMESTAMP_TIME) // Time value - days= l_time1->day - l_sign*l_time2->day; + days= (long)l_time1->day - l_sign * (long)l_time2->day; else { days= calc_daynr((uint) l_time1->year, (uint) l_time1->month, (uint) l_time1->day); if (l_time2->time_type == MYSQL_TIMESTAMP_TIME) - days-= l_sign*l_time2->day; + days-= l_sign * (long)l_time2->day; else days-= l_sign*calc_daynr((uint) l_time2->year, (uint) l_time2->month, |