into neptunus.(none):/home/msvensson/mysql/mysql-5.1 mysql-test/r/innodb.result: Auto merged mysql-test/r/myisam.result: Auto merged