-
unknown authored
into o2k.irixworld.net:/usr/people/mysqldev/jonas/tmp ndb/src/kernel/vm/SimulatedBlock.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/ndbapi/TransporterFacade.cpp: Auto merged
5ab30c99
into o2k.irixworld.net:/usr/people/mysqldev/jonas/tmp ndb/src/kernel/vm/SimulatedBlock.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/ndbapi/TransporterFacade.cpp: Auto merged