into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


sql/sql_parse.cc:
  Auto merged