into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug19378 storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged