into mysql.com:/home/jonas/src/ll
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
Only updates values mgmsrv's on main memory
to be used in test prg's
ndb/include/mgmapi/mgmapi_debug.h:
Update on config
ndb/include/util/ConfigValues.hpp:
Update on config
ndb/src/mgmapi/mgmapi.cpp:
Update on config
ndb/src/mgmsrv/MgmtSrvr.cpp:
Update on config
ndb/src/mgmsrv/MgmtSrvr.hpp:
Update on config
ndb/src/mgmsrv/Services.cpp:
Update on config
ndb/src/mgmsrv/Services.hpp:
Update on config
BitKeeper/etc/logging_ok:
auto-union
ndb/include/kernel/NodeState.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/include/util/Bitmask.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/kernel/error/ErrorReporter.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CpcClient.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/test/include/NDBT_Table.hpp:
Auto merged
ndb/test/include/NDBT_Test.hpp:
Auto merged
ndb/test/run-test/main.cpp:
Auto merged
ndb/test/src/HugoOperations.cpp:
Auto merged
ndb/test/src/HugoTransactions.cpp:
Auto merged
ndb/test/src/NDBT_Tables.cpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
Auto merged
ndb/test/src/NdbRestarter.cpp:
Auto merged
ndb/tools/waiter.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/src/common/util/ConfigValues.cpp:
BUG#4384
Compute pointers manually instead of using ptr[-x]
Changed return type from "*&" to "**"
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
ndb/include/kernel/NodeInfo.hpp:
alligning node numbering
ndb/include/kernel/NodeState.hpp:
added connected nodes to NodeState
ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
moved to NodeState
ndb/include/mgmapi/mgmapi.h:
alligning node numbering
ndb/include/mgmapi/mgmapi_config_parameters.h:
new config port_base param on system
ndb/include/util/Bitmask.hpp:
POD Bitmask
ndb/include/util/SocketAuthenticator.hpp:
SocketAut fix
ndb/src/common/mgmcommon/ConfigInfo.cpp:
added new config param
ndb/src/common/transporter/Transporter.cpp:
alligning node numbering
ndb/src/common/transporter/TransporterRegistry.cpp:
alligning node numbering
ndb/src/common/util/SocketAuthenticator.cpp:
alligning node numbering
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
moved connected nodes to NodeState
ndb/src/mgmsrv/MgmtSrvr.cpp:
allocation and delallocation of resources in mgmsrvr
connected bitmask on each node status together with reserved nodes
that are reserved as long as session is active
+ check that hostname is same as client name
ndb/src/mgmsrv/MgmtSrvr.hpp:
allocation and delallocation of resources in mgmsrvr
connected bitmask on each node status together with reserved nodes
that are reserved as long as session is active
ndb/src/mgmsrv/Services.cpp:
added destuctor for apisession
ndb/src/mgmsrv/Services.hpp:
..
ndb/src/mgmsrv/main.cpp:
print node id
ndb/src/ndbapi/ClusterMgr.cpp:
..
ndb/src/ndbapi/ClusterMgr.hpp:
..
ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
Added info about connected nodes to ApiRegConf
ndb/include/mgmapi/mgmapi.h:
New mgmapi command to get nodeid dynamically
ndb/include/mgmapi/mgmapi_config_parameters.h:
New config param to specify port on for transporter setup
ndb/include/mgmcommon/ConfigRetriever.hpp:
added notetype to getConfig
ndb/include/portlib/NdbTCP.h:
small detail
ndb/include/transporter/TransporterRegistry.hpp:
changed performstates and interface to connect/disconnect transporters
added TransporterService for transporter setup
changed model for setting up transporters
ndb/src/common/mgmcommon/ConfigInfo.cpp:
removed some config params as mandatory
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
added dynamic alloc of nodeid
ndb/src/common/mgmcommon/LocalConfig.cpp:
added default localhost:2200 and dynamic id
ndb/src/common/transporter/TCP_Transporter.cpp:
moved TCP hostname stuff from TCP_Transporter to parent class Transporter
changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/TCP_Transporter.hpp:
moved TCP hostname stuff from TCP_Transporter to parent class Transporter
changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/Transporter.cpp:
moved TCP hostname stuff from TCP_Transporter to parent class Transporter
changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/Transporter.hpp:
moved TCP hostname stuff from TCP_Transporter to parent class Transporter
changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/TransporterRegistry.cpp:
changed performstates and interface to connect/disconnect transporters
added TransporterService for transporter setup
changed model for setting up transporters
ndb/src/common/util/Makefile.am:
New SocketAuthenticator
ndb/src/common/util/SocketServer.cpp:
small detail
ndb/src/kernel/Makefile.am:
small detail
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
new interface to performstates + cleanup
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
changed signal ApiRegConf
ndb/src/kernel/vm/ThreadConfig.cpp:
changed naming
ndb/src/mgmapi/mgmapi.cpp:
Use new Socket client
New methid for allocating dynamic id
ndb/src/mgmsrv/MgmtSrvr.cpp:
moved port setup from main.cpp to MgmtSrvr
new method getNextFreeNodeId
ndb/src/mgmsrv/MgmtSrvr.hpp:
..
ndb/src/mgmsrv/Services.cpp:
allocate new nodeid
ndb/src/mgmsrv/Services.hpp:
..
ndb/src/mgmsrv/main.cpp:
moved setup port to MgmtSrvr.cpp
Rearranged setup order
ndb/src/ndbapi/ClusterMgr.cpp:
new API_REGCONF
ndb/src/ndbapi/ClusterMgr.hpp:
bitmask to hold connected nodes
ndb/src/ndbapi/TransporterFacade.cpp:
New transporter connect
ndb/src/ndbapi/TransporterFacade.hpp:
removed function not used
ndb/src/kernel/main.cpp:
new transporter setup
ndb/include/ndbapi/Ndb.hpp:
Auto merged
ndb/include/ndbapi/NdbApi.hpp:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/ndbapi/Makefile_old:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationScan.cpp:
Auto merged
ndb/src/ndbapi/NdbOperationSearch.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/src/ndbapi/Ndblist.cpp:
Auto merged
ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp:
Auto merged
ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp:
Auto merged
ndb/src/old_files/client/odbc/common/DataType.cpp:
Auto merged
ndb/src/old_files/client/odbc/common/DataType.hpp:
Auto merged
ndb/test/ndbapi/Makefile_old:
Auto merged
ndb/tools/ndbsql.cpp:
Auto merged
included full my_global.h and resolved some resulting name conflicts
ndb/include/ndb_global.h:
included full my_global.h and resolved some resulting name conflicts
ndb/include/logger/FileLogHandler.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/include/util/File.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/common/logger/FileLogHandler.cpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/common/util/File.cpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/common/util/strlcat.c:
included full my_global.h and resolved some resulting name conflicts
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/rep/RepComponents.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/rep/rep_version.hpp:
included full my_global.h and resolved some resulting name conflicts
ndb/src/rep/storage/GCIContainer.hpp:
included full my_global.h and resolved some resulting name conflicts
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb_global.h:
new file
ndb/Defs.mk:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/Epilogue.mk:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/include/util/NdbString.h:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/src/common/util/getarg.c:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/src/common/util/strdup.c:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/src/common/util/strlcat.c:
introduced ndb_global.h and removed som HAVE_ and -D flags
ndb/src/common/util/strlcpy.c:
introduced ndb_global.h and removed som HAVE_ and -D flags