unknown e60119f8a5 Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 ... into mysql.com:/space/pekka/ndb/version/my51-bug14509 mysql-test/t/ndb_alter_table.test: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/ndbapi/DictCache.cpp: Auto merged storage/ndb/src/ndbapi/DictCache.hpp: Auto merged mysql-test/r/ndb_alter_table.result: manual merge storage/ndb/include/ndbapi/Ndb.hpp: manual merge storage/ndb/src/ndbapi/Ndb.cpp: manual merge [needs more fixes] storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: SCCS merged storage/ndb/src/ndbapi/Ndbinit.cpp: SCCS merged		2006-05-16 09:37:11 +02:00
..
Ndb.hpp	Merge mysql.com:/space/pekka/ndb/version/my50-bug14509	2006-05-16 09:37:11 +02:00
ndb_cluster_connection.hpp	manual merge	2006-02-13 14:25:31 +01:00
ndb_opt_defaults.h	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
NdbApi.hpp	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
ndbapi_limits.h	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-05-20 06:25:02 +02:00
NdbBlob.hpp	Merge mysql.com:/home/my/mysql-5.0	2006-05-04 15:58:30 +03:00
NdbDictionary.hpp	removing the usage if the ndb local dict cache to adress the 241 errors we get now and then	2006-05-04 13:58:17 +02:00
ndberror.h	wl2325 wl2324	2006-01-12 19:51:02 +01:00
NdbError.hpp	wl2325 wl2324	2006-01-12 19:51:02 +01:00
NdbEventOperation.hpp	NdbEventOperationImpl.cpp, NdbEventOperation.cpp, NdbEventOperation.hpp:	2006-02-08 09:58:47 +01:00
NdbIndexOperation.hpp	Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0	2006-03-23 22:39:30 +01:00
NdbIndexScanOperation.hpp	Import ndb varsize	2005-11-07 12:19:28 +01:00
NdbIndexStat.hpp	removing the usage if the ndb local dict cache to adress the 241 errors we get now and then	2006-05-04 13:58:17 +02:00
NdbOperation.hpp	Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge	2006-05-10 21:38:48 +02:00
NdbPool.hpp	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
NdbRecAttr.hpp	Import ndb varsize	2005-11-07 12:19:28 +01:00
NdbReceiver.hpp	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
NdbScanFilter.hpp	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
NdbScanOperation.hpp	Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0	2006-03-23 22:39:30 +01:00
NdbTransaction.hpp	ndb: removed TransporterFacade singleton	2006-03-22 17:28:45 +01:00