-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/51-work storage/ndb/src/ndbapi/TransporterFacade.cpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.hpp: Auto merged storage/ndb/src/ndbapi/Ndbif.cpp: merge
216944f5
into perch.ndb.mysql.com:/home/jonas/src/51-work storage/ndb/src/ndbapi/TransporterFacade.cpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.hpp: Auto merged storage/ndb/src/ndbapi/Ndbif.cpp: merge