-
unknown authored
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935 storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/ERROR_codes.txt: manual
f6d2231c
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug14935 storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/ERROR_codes.txt: manual