into  mysql.com:/home/svoj/devel/mysql/BUG26238/mysql-5.1-engines


mysql-test/r/delayed.result:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
sql/field.h:
  Use local.