Skip to content

M
mariadb
Commit a4a4c5cb authored by dlenev@brandersnatch.localdomain's avatar dlenev@brandersnatch.localdomain
Browse files
Options

Fix for func_sapdb failures on 64-bit platforms (aka Bug #10040 

"'func_sapdb' fails on 64bit build hosts")
parent 5b74b6fd
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/item_timefunc.cc
View file @ a4a4c5cb
...@@ -800,14 +800,14 @@ static bool calc_time_diff(TIME *l_time1, TIME *l_time2, int l_sign, ...@@ -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. We should check it before calc_time_diff call.
*/ */
if (l_time1->time_type == MYSQL_TIMESTAMP_TIME) // Time value 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 else
{ {
days= calc_daynr((uint) l_time1->year, days= calc_daynr((uint) l_time1->year,
(uint) l_time1->month, (uint) l_time1->month,
(uint) l_time1->day); (uint) l_time1->day);
if (l_time2->time_type == MYSQL_TIMESTAMP_TIME) if (l_time2->time_type == MYSQL_TIMESTAMP_TIME)
days-= l_sign*l_time2->day; days-= l_sign * (long)l_time2->day;
else else
days-= l_sign*calc_daynr((uint) l_time2->year, days-= l_sign*calc_daynr((uint) l_time2->year,
(uint) l_time2->month, (uint) l_time2->month,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7