into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged storage/ndb/tools/restore/Restore.cpp: Auto merged