Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/cps/mysql/trees/mysql-5.0

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2a5f8ffe · petr@mysql.com · 8053dbca · 2b04efe2 · 2a5f8ffe
Commit 2a5f8ffe authored May 18, 2005 by petr@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item_func.cc sql/item_func.cc +1 -1

No files found.
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1827,7 +1827,7 @@ void Item_func_round::fix_length_and_dec()
    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;