Commit 9c9e64d5 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/cps/mysql/trees/mysql-5.0
parents 688afe81 c3ecc1dd

sql/item_func.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;