into mysql.com:/home/dlenev/src/mysql-4.1-bg1500-2


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