into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb mysql-test/t/ndb_restore.test: Auto merged mysql-test/r/ndb_restore.result: null merge