unknown 1bbf2f7c9c Merge perch.ndb.mysql.com:/home/jonas/src/50-work ... into perch.ndb.mysql.com:/home/jonas/src/51-jonas storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: Auto merged storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/FailRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/WaitGCP.hpp: Auto merged storage/ndb/src/common/debugger/EventLogger.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp: Auto merged storage/ndb/src/kernel/vm/Configuration.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged storage/ndb/test/src/NdbRestarts.cpp: Auto merged storage/ndb/include/mgmapi/ndb_logevent.h: merge storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: merge storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp: merge storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: merge storage/ndb/test/run-test/daily-basic-tests.txt: merge		2006-04-06 13:18:13 +02:00
..
mgmapi.h	manual merge	2006-02-13 14:25:31 +01:00
mgmapi_config_parameters.h	ndb dd - bug#16657 - add new config variable	2006-02-22 14:23:53 +01:00
mgmapi_config_parameters_debug.h	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
mgmapi_debug.h	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
ndb_logevent.h	Merge perch.ndb.mysql.com:/home/jonas/src/50-work	2006-04-06 13:18:13 +02:00
ndb_logevent.txt	merge	2005-09-15 13:07:22 +02:00
ndbd_exit_codes.h	Merge perch.ndb.mysql.com:/home/jonas/src/50-work	2006-03-24 07:43:55 +01:00