- when connecting to a mgm server as a transporter, create a NdbMgmHandle
- over this mgm handle, report the dynamic ports
- then turn it into a transporter
- this will re-report dynamic ports to mgmds when they restart (as we'll have to
set up our transporter again). This will also report it to all mgmds (as we'll
have transporters to all of them).
ndb/include/mgmapi/mgmapi.h:
Add ndb_mgm_convert_to_transporter
- converts to a transporter connect
- destroys the handle (without disconnecting)
- returns socket
ndb/include/transporter/TransporterRegistry.hpp:
Add prototype for connect_ndb_mgmd
ndb/include/util/SocketClient.hpp:
Remove connect_without_auth
Add get_port() and get_server_name()
ndb/src/common/transporter/Transporter.cpp:
use TransporterRegistry::connect_ndb_mgmd() to make the connection if isMgmConnection
ndb/src/common/transporter/TransporterRegistry.cpp:
Impliment TransporterRegistry::connect_ndb_mgmd
- takes a SocketClient and constructs a connectstring.
- uses this connect string to make a NdbMgmHandle
- send dynamic ports to this mgm server
- transform into a transporter connect
- return socket
ndb/src/common/util/SocketClient.cpp:
Remove connect_without_auth
ndb/src/kernel/main.cpp:
Don't relay dynamic ports. We now do this on transporter connect
ndb/src/mgmapi/mgmapi.cpp:
Impliment ndb_mgm_convert_to_transporter
- converts the mgm connection into a transporter connection
- destroys the handle
- returns the socket that should now be used as a transporter
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
Treat the management server specially.
It should always be the server in a transporter as we then have a known
port to connect to on node restart.
allows a mgm connection (i.e. to the management server port, our known port)
to be transformed into a transporter connection.
Also, clean up the struct TransporterConfiguration (used to be a struct for
each transporter type. now there's just one)
ndb/include/transporter/TransporterDefinitions.hpp:
Clean up XXX_TransporterConfiguration and create one TransporterConfiguration structure.
Makes things easier to read (especially in IPCConfig.cpp)
ndb/include/transporter/TransporterRegistry.hpp:
add get_mgm_handle (to compliment the set_mgm_handle function)
clean up createTransporter to use just one TransporterConfiguration struct
ndb/include/util/SocketClient.hpp:
Introduce connect_without_auth() to ignore any authentication method that may have been set.
ndb/src/common/mgmcommon/IPCConfig.cpp:
Remove dead IPCConfig::configureTransporters(TransporterRegistry*)
Fixup IPCConfig::configureTransporters(Uint32 nodeId...)
- use the 'one struct TransporterConfiguration to rule them all'
- make MGM node the server
- fix switch statement for transporter types
- close } in strange place
- possible inadvertent fall through
ndb/src/common/transporter/OSE_Transporter.cpp:
a partial fix for the introduction of new parameters.
OSE shouldn't build how it is now. Better to keep the build broken than have it build and fail strangely at runtime.
ndb/src/common/transporter/OSE_Transporter.hpp:
a partial fix for the introduction of new parameters.
OSE shouldn't build how it is now. Better to keep the build broken than have it build and fail strangely at runtime.
ndb/src/common/transporter/SCI_Transporter.cpp:
should be correct for SCI transporter.
ndb/src/common/transporter/SCI_Transporter.hpp:
should be correct for SCI transporter
ndb/src/common/transporter/SHM_Transporter.cpp:
add new parameters for Transporter constructor
ndb/src/common/transporter/SHM_Transporter.hpp:
add new parameters for Transporter constructor
ndb/src/common/transporter/TCP_Transporter.cpp:
add new parameters for Transporter constructor
ndb/src/common/transporter/TCP_Transporter.hpp:
add new parameters for Transporter constructor
ndb/src/common/transporter/Transporter.cpp:
Add new parameters
- isMgmConnection
requires transforming from mgm to transporter
- serverNodeId
node id that will serve as the server
Treat connection differently if isMgmConnection (send a special mgm command first)
ndb/src/common/transporter/Transporter.hpp:
add fields to constructor
add isMgmConnection member (if true, have to transform a mgm connection)
ndb/src/common/transporter/TransporterRegistry.cpp:
createTransporter -> createTCPTransporter (etc)
add extra transporter constructor parameters (from config)
modify to use changes to TransporterConfiguration
ndb/src/common/util/SocketClient.cpp:
SocketClient::connect_without_auth()
Temporarily disables authentication and connects.
This is useful if you're trying to change what this
SocketClient object is for (e.g. from mgm to ndb)
ndb/src/common/util/SocketServer.cpp:
Don't runSession or close socket when entering sessionThread if m_stopped
ndb/src/mgmsrv/ConfigInfo.cpp:
fixPortNumber
- Get port number from the MGM node as it will always be the server
ndb/src/mgmsrv/MgmtSrvr.cpp:
transporter_connect(sockfd)
- transform this mgm connection into a transporter connection
ndb/src/mgmsrv/MgmtSrvr.hpp:
prototype for transporter_connect
ndb/src/mgmsrv/Services.cpp:
add command: "transporter connect"
stops the MgmApiSession and replaces it with a transporter connection
ndb/src/mgmsrv/Services.hpp:
prototype for transporter_connect
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
sql/sql_yacc.yy:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
corrected documentation on fragmentation
set "fragmentation medium" to mean 2 fragments per node instead of 1
set default fragmentation to small instead of medium
bug#8284 adjust fragmentation to max_rows
mysql-test/r/ndb_basic.result:
added test to trigger drifferent fragmentations in ndb
mysql-test/t/ndb_basic.test:
added test to trigger drifferent fragmentations in ndb
ndb/include/ndbapi/NdbDictionary.hpp:
corrected documentation on fragmentation
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
set "fragmentation medium" to mean 2 fragments per node instead of 1
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
set default fragmentation to small instead of medium
sql/ha_ndbcluster.cc:
bug#8284 adjust fragmentation to max_rows
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
mysql-test/t/ndb_restore.test:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/test/include/HugoOperations.hpp:
Auto merged
ndb/test/include/NDBT_Test.hpp:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
Auto merged
ndb/test/ndbapi/flexBench.cpp:
Auto merged
ndb/test/ndbapi/flexHammer.cpp:
Auto merged
ndb/test/ndbapi/flexTT.cpp:
Auto merged
ndb/test/ndbapi/flex_bench_mysql.cpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
corrected automerge error
add abort to multi op test case
ndb/include/ndbapi/NdbConnection.hpp:
Add aborts to test case
ndb/test/include/HugoOperations.hpp:
Add aborts to test case
ndb/test/ndbapi/testOperations.cpp:
Add aborts to test case
ndb/test/src/HugoOperations.cpp:
Add aborts to test case
ndb/test/src/HugoTransactions.cpp:
Add aborts to test case
1) New testcase
Check every combination of ins/upd/del of length 5
Check reading savepoint's
2) Fix 1 liner in acc wrt committing read
ndb/include/ndbapi/NdbConnection.hpp:
Make testcase friend
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Fix so that committing a READ can _not_ result in setting elementIsDisappeared
ndb/test/include/NDBT_Test.hpp:
Make copy of testcase name
ndb/test/ndbapi/testOperations.cpp:
New testcase
Check every combination of ins/upd/del of length 5
Check reading savepoint's
ndb/test/src/HugoOperations.cpp:
Close transaction in destructor
ndb/test/src/NDBT_Test.cpp:
Make copy of testcase name
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl5
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/cw/cpcd/main.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/docs/Makefile.am:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
removed usage of SIGRTMIN temorarilly as it causes problems on some platforms
ndb/include/ndbapi/ndb_opt_defaults.h:
removed usage of SIGRTMIN temorarilly as it causes problems on some platforms
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
ndb/include/Makefile.am:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/tools/delete_all.cpp:
Auto merged
ndb/tools/desc.cpp:
Auto merged
ndb/tools/drop_index.cpp:
Auto merged
ndb/tools/drop_tab.cpp:
Auto merged
ndb/tools/listTables.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/tools/select_all.cpp:
Auto merged
ndb/tools/select_count.cpp:
Auto merged
ndb/tools/waiter.cpp:
Auto merged
ndb/include/util/ndb_opts.h:
SCCS merged
ndb/src/mgmsrv/main.cpp:
resolved merge conflict
added shared memory config parameter, signum for use in signalling
added global variable for holdign signum to be used for shared memory connection
only fiddle with signals if it is set
simplified common ndb client option handling
ndb/include/Makefile.am:
added common defaults file
ndb/include/mgmapi/mgmapi_config_parameters.h:
added shared memory config parameter, signum for use in signalling
ndb/include/transporter/TransporterDefinitions.hpp:
added shared memory config parameter, signum for use in signalling
ndb/include/util/ndb_opts.h:
simplified common ndb client option handling
ndb/src/common/mgmcommon/IPCConfig.cpp:
added shared memory config parameter, signum for use in signalling
ndb/src/common/portlib/NdbThread.c:
added global variable for holdign signum to be used for shared memory connection
only block signals if shared memory is used
ndb/src/common/transporter/SHM_Transporter.cpp:
use signum in new global variable for shared memory signalling
ndb/src/common/transporter/TransporterRegistry.cpp:
use signum in new global variable for shared memory signalling
only fiddle with signals if it is set
ndb/src/cw/cpcd/main.cpp:
ndb_opts not really used
ndb/src/kernel/vm/Configuration.cpp:
simplified common ndb client option handling
ndb/src/mgmclient/main.cpp:
simplified common ndb client option handling
ndb/src/mgmsrv/ConfigInfo.cpp:
added shared memory config parameter, signum for use in signalling
ndb/src/mgmsrv/main.cpp:
simplified common ndb client option handling
ndb/tools/delete_all.cpp:
simplified common ndb client option handling
ndb/tools/desc.cpp:
simplified common ndb client option handling
ndb/tools/drop_index.cpp:
simplified common ndb client option handling
ndb/tools/drop_tab.cpp:
simplified common ndb client option handling
ndb/tools/listTables.cpp:
simplified common ndb client option handling
ndb/tools/restore/restore_main.cpp:
simplified common ndb client option handling
ndb/tools/select_all.cpp:
simplified common ndb client option handling
ndb/tools/select_count.cpp:
simplified common ndb client option handling
ndb/tools/waiter.cpp:
simplified common ndb client option handling
mysql-test/r/ndb_index_ordered.result:
make YEAR and TIMESTAMP into ndb types
mysql-test/t/ndb_index_ordered.test:
make YEAR and TIMESTAMP into ndb types
ndb/include/kernel/signaldata/DictTabInfo.hpp:
make YEAR and TIMESTAMP into ndb types
ndb/include/ndbapi/NdbDictionary.hpp:
make YEAR and TIMESTAMP into ndb types
ndb/include/util/NdbSqlUtil.hpp:
make YEAR and TIMESTAMP into ndb types
ndb/src/common/util/NdbSqlUtil.cpp:
make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionary.cpp:
make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbRecAttr.cpp:
make YEAR and TIMESTAMP into ndb types
ndb/test/include/NdbSchemaOp.hpp:
make YEAR and TIMESTAMP into ndb types
sql/ha_ndbcluster.cc:
make YEAR and TIMESTAMP into ndb types
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl4
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl4
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/kernel/AttributeHeader.hpp:
Auto merged
ndb/include/ndb_global.h.in:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
