into mashka.mysql.fi:/home/my/mysql-4.0


sql/item_cmpfunc.h:
  Auto merged