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


mysql-test/r/check.result:
  Auto merged
mysql-test/t/check.test:
  Auto merged
sql/handler.cc:
  Auto merged