unknown 6e0cdd897a Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 ... into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285 storage/ndb/include/ndbapi/NdbBlob.hpp: manual merge storage/ndb/include/ndbapi/NdbScanOperation.hpp: SCCS merged storage/ndb/src/ndbapi/NdbBlob.cpp: SCCS merged storage/ndb/src/ndbapi/NdbBlobImpl.hpp: manual merge storage/ndb/src/ndbapi/ndberror.c: use local - add 4275 afterwards storage/ndb/test/ndbapi/testBlobs.cpp: automerge		2006-06-17 11:10:43 +02:00
..
Ndb.hpp	After merge fixes	2006-06-05 06:16:08 +03:00
ndb_cluster_connection.hpp
ndb_opt_defaults.h
NdbApi.hpp
ndbapi_limits.h
NdbBlob.hpp	Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285	2006-06-17 11:10:43 +02:00
NdbDictionary.hpp	Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database	2006-05-31 10:28:42 +02:00
ndberror.h
NdbError.hpp
NdbEventOperation.hpp
NdbIndexOperation.hpp
NdbIndexScanOperation.hpp	Merge mysql.com:/home/marty/MySQL/mysql-5.0	2006-06-12 11:34:00 +02:00
NdbIndexStat.hpp
NdbOperation.hpp
NdbPool.hpp
NdbRecAttr.hpp
NdbReceiver.hpp
NdbScanFilter.hpp
NdbScanOperation.hpp	Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285	2006-06-17 11:10:43 +02:00
NdbTransaction.hpp