into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge


sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged