Merge mysql.com:/home/hf/work/27957/my50-27957

into  mysql.com:/home/hf/work/27957/my51-27957


mysql-test/r/cast.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/my_decimal.h:
  merging
This commit is contained in:
unknown 2007-05-11 18:16:46 +05:00
commit 5f41b262a7

View file

@ -395,15 +395,7 @@ int my_decimal_intg(const my_decimal *a)
}
void my_decimal_trim(ulong *precision, uint *scale)
{
if (!(*precision) && !(*scale))
{
*precision= 10;
*scale= 0;
return;
}
}
void my_decimal_trim(ulong *precision, uint *scale);
#endif /*my_decimal_h*/