bk commit into 5.1 tree (kaa:1.2492)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa 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@stripped, 2007-04-28 23:27:24+04:00, kaa@stripped +1 -0
  Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
  into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
  MERGE: 1.1810.2865.24

  sql/item_func.cc@stripped, 2007-04-28 23:27:19+04:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.270.1.66

# 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:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/mysql-5.1-maint/RESYNC

--- 1.382/sql/item_func.cc	2007-04-28 23:20:13 +04:00
+++ 1.383/sql/item_func.cc	2007-04-28 23:27:19 +04:00
@@ -2066,7 +2066,7 @@ longlong Item_func_round::int_op()
   else
     value= (unsigned_flag || value >= 0) ?
       my_unsigned_round((ulonglong) value, tmp) :
-      -my_unsigned_round((ulonglong) -value, tmp);
+      -(longlong) my_unsigned_round((ulonglong) -value, tmp);
   return value;
 }
 
@@ -2078,13 +2078,13 @@ my_decimal *Item_func_round::decimal_op(
   if (dec > 0 || (dec < 0 && args[1]->unsigned_flag))
   {
     dec= min((ulonglong) dec, DECIMAL_MAX_SCALE);
-    decimals= dec; // to get correct output
+    decimals= (uint8) dec; // to get correct output
   }
   else if (dec < INT_MIN)
     dec= INT_MIN;
     
   if (!(null_value= (args[0]->null_value || args[1]->null_value ||
-                     my_decimal_round(E_DEC_FATAL_ERROR, value, dec,
+                     my_decimal_round(E_DEC_FATAL_ERROR, value, (int) dec,
                                       truncate, decimal_value) > 1)))
     return decimal_value;
   return 0;