into  chilla.local:/home/mydev/mysql-5.1-bug20627


mysql-test/t/delayed.test:
  Auto merged
sql/sql_insert.cc:
  Manual merge from 5.0.