bk commit into 4.1 tree (dlenev:1.2203) BUG#10040

[dlenev]

Below is the list of changes that have just been committed into a local
4.1 repository of dlenev. When dlenev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2203 05/04/25 11:25:40 dlenev@stripped +1 -0
  Fix for func_sapdb failures on 64-bit platforms (aka Bug #10040 
  "'func_sapdb' fails on 64bit build hosts")

  sql/item_timefunc.cc
    1.85 05/04/25 11:25:37 dlenev@stripped +2 -2
    calc_time_diff():
      Fixed yet another signedness problem.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dlenev
# Host:	brandersnatch.localdomain
# Root:	/home/dlenev/src/mysql-4.1-bg10040

--- 1.84/sql/item_timefunc.cc	Mon Mar 28 16:20:50 2005
+++ 1.85/sql/item_timefunc.cc	Mon Apr 25 11:25:37 2005
@@ -800,14 +800,14 @@
     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,