-
unknown authored
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: manual merge storage/ndb/src/ndbapi/ndberror.c: manual merge
f184c817
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: manual merge storage/ndb/src/ndbapi/ndberror.c: manual merge