into narttu.mysql.fi:/my/mysql-4.0


sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged