diff options
| author | unknown <dlenev@mysql.com> | 2005-04-25 11:35:30 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-04-25 11:35:30 +0400 |
| commit | 329761e81197c85eb716337bd983f7fbec1d6a80 (patch) | |
| tree | 8e24cd6dee5ffe54013727ce511a8c6f23b93445 | |
| parent | c1d6b29c2a10fed50c01d8930f1e9c7809b2485c (diff) | |
| parent | 20cf8f82eefbc4db26ec50aef4f602c991811397 (diff) | |
| download | mariadb-git-329761e81197c85eb716337bd983f7fbec1d6a80.tar.gz | |
Merge mysql.com:/home/dlenev/src/mysql-4.1-bg10040
into mysql.com:/home/dlenev/src/mysql-5.0-merges
sql/item_timefunc.cc:
Auto merged
| -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 cd4777d542b..7a9c7898856 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -814,14 +814,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, |