into  mysql.com:/opt/local/work/mysql-5.0-root


sql/item_strfunc.cc:
  Auto merged
sql/password.c:
  Manual merge