-
unknown authored
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore storage/ndb/include/ndbapi/NdbRecAttr.hpp: Auto merged storage/ndb/src/ndbapi/NdbRecAttr.cpp: manual merge
56b937db
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore storage/ndb/include/ndbapi/NdbRecAttr.hpp: Auto merged storage/ndb/src/ndbapi/NdbRecAttr.cpp: manual merge