into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged