into mysql.com:/home/dlenev/src/mysql-4.1-bg9913


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged