into  mysql.com:/usr/home/bar/mysql-5.1-new


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