unknown 165491a4dd Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work ... into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work storage/ndb/include/kernel/GlobalSignalNumbers.h: Auto merged storage/ndb/src/common/debugger/signaldata/SignalNames.cpp: Auto merged storage/ndb/src/common/util/OutputStream.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/mgmsrv/Services.hpp: Auto merged storage/ndb/include/mgmapi/mgmapi.h: merge storage/ndb/include/util/OutputStream.hpp: merge storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: merge storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp: merge		2007-02-14 16:37:40 +11:00
..
mgmapi.h	Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work	2007-02-14 16:37:40 +11:00
mgmapi_config_parameters.h	Merge mysql.com:/home/kent/bk/main/mysql-5.0	2006-12-31 01:32:21 +01:00
mgmapi_config_parameters_debug.h	Merge mysql.com:/home/kent/bk/main/mysql-5.0	2006-12-31 01:32:21 +01:00
mgmapi_debug.h	Merge mysql.com:/home/kent/bk/main/mysql-5.0	2006-12-23 20:20:40 +01:00
ndb_logevent.h	Merge mysql.com:/home/kent/bk/main/mysql-5.0	2006-12-23 20:20:40 +01:00
ndb_logevent.txt	merge	2005-09-15 13:07:22 +02:00
ndbd_exit_codes.h	ndb - bug#25801	2007-02-05 19:47:19 +01:00