bk commit into 5.0 tree (georg:1.1853)

[Georg Richter]

Below is the list of changes that have just been committed into a local
5.0 repository of georg. When georg 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.1853 05/05/18 14:13:58 georg@stripped +1 -0
  fixed fatal compiler error (windows)

  sql/item_func.cc
    1.196 05/05/18 14:13:52 georg@stripped +1 -1
    fixed fatal compiler error (windows)

# 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:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.0

--- 1.195/sql/item_func.cc	2005-05-17 10:50:39 +02:00
+++ 1.196/sql/item_func.cc	2005-05-18 14:13:52 +02:00
@@ -1827,7 +1827,7 @@
     return;
   }
   
-  int decimals_to_set= max(args[1]->val_int(), 0);
+  int decimals_to_set= max((int)args[1]->val_int(), 0);
   if (args[0]->decimals == NOT_FIXED_DEC)
   {
     max_length= args[0]->max_length;