-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/51-work storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/common/util/socket_io.cpp: merge
02e63d35
into perch.ndb.mysql.com:/home/jonas/src/51-work storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/common/util/socket_io.cpp: merge