into hundin.mysql.fi:/home/heikki/mysql-5.0
innobase/log/log0recv.c:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/include/mgmapi/mgmapi_config_parameters.h:
Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/mgmsrv/ConfigInfo.cpp:
Reenable MAX_OPEN_FILES to enable LCP in some situations
debug printouts
ndb documentation update
ndb/include/ndbapi/Ndb.hpp:
ndb documentation update
ndb/src/kernel/blocks/suma/Suma.cpp:
fixed mem leak in subscriction handling in Suma
debug printouts
ndb/src/kernel/blocks/suma/Suma.hpp:
fixed mem leak in subscriction handling in Suma
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
ndb/include/kernel/signaldata/SumaImpl.hpp:
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
fixed bug in event handling of several tables
ndb/include/kernel/signaldata/CreateEvnt.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/include/kernel/signaldata/CreateIndx.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/src/ndbapi/ndberror.c:
remove obsolete attribute storage type ACC vs TUP
ndb/test/include/NdbSchemaOp.hpp:
remove obsolete attribute storage type ACC vs TUP
ndb/test/ndbapi/bench/userInterface.cpp:
remove obsolete attribute storage type ACC vs TUP
ndb/test/src/NdbSchemaOp.cpp:
remove obsolete attribute storage type ACC vs TUP
move internal mgmapi functions into it.
should also fix AIX build problem.
ndb/include/mgmapi/mgmapi.h:
Move ndb_mgm_convert_to_transporter to mgmapi_internal.h
Should fix AIX build problem
ndb/include/mgmapi/mgmapi_debug.h:
Move ndb_mgm_(get|set)_connection_int_parameter to mgmapi_internal.h
ndb/src/common/transporter/Makefile.am:
Add ndb/src/mgmapi to include for common/transporter (TransporterRegistry requires the use of mgmapi_internal.h)
ndb/src/common/transporter/TransporterRegistry.cpp:
Use mgmapi_internal.h
ndb/src/mgmapi/mgmapi.cpp:
some functions defined in mgmapi_internal.h
ndb/src/ndbapi/ndb_cluster_connection.cpp:
use functions from mgmapi_internal.h
into mysql.com:/home/jonas/src/mysql-4.1
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
set exec_flag in execTC_COMMITREQ so that api will get rollbackrep
ndb/include/ndbapi/NdbConnection.hpp:
Make getConnectedNode public
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Fix TC_COMMITREQ in abort cases
ndb/test/ndbapi/testNodeRestart.cpp:
Testcase for bug#8853
ndb/test/run-test/daily-devel-tests.txt:
Testcase for bug#8853
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
ndb/include/kernel/signaldata/CreateIndx.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
More explicit naming of variables
ndb/include/kernel/signaldata/AlterIndx.hpp:
Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/BuildIndx.hpp:
Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/CreateIndx.hpp:
Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/CreateTrig.hpp:
Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/DropIndx.hpp:
Add union to indicate where master node is passed in ref
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Set error/master node also on BuildIndxRef
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Use masterNodeId instead of errornode
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/include/kernel/signaldata/CreateIndx.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
into mysql.com:/home/jonas/src/mysql-4.1
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
remove dict forwarding
add api retries on NotMaster
ndb/include/kernel/signaldata/AlterIndx.hpp:
Add NotMaster error code
ndb/include/kernel/signaldata/BuildIndx.hpp:
Add NotMaster error code
ndb/include/kernel/signaldata/CreateIndx.hpp:
Add NotMaster error code
ndb/include/kernel/signaldata/CreateTrig.hpp:
Add NotMaster error code
ndb/include/kernel/signaldata/DropIndx.hpp:
Add NotMaster error code
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Never forward requests,
instead REF to API who will retry towards correct node
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
1) Set error code for timeout
2) Handle NotMaster with retry in all DICT requests
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Fix so that input values is in seconds and not 100ms's
sql/ha_ndbcluster.cc:
Wait 3 sec for all nodes to connect...
ndb/include/mgmapi/mgmapi.h:
ndb_mgm_convert_to_transporter may destroy the handle, now takes a pointer.
ndb/include/mgmcommon/ConfigRetriever.hpp:
If outside code is going to manipulate the NdbMgmHandle, allow it to do it
via a get_mgmHandlePtr() call
ndb/include/transporter/TransporterRegistry.hpp:
connect_client and connect_ndb_mgmd may destroy the handle, now they take a pointer.
ndb/src/common/transporter/TransporterRegistry.cpp:
When start_service is binding to ports, report back the port numbers.
We need this here now, as we re-use the initial mgm connection as a transporter, which
is connected *before* start_service has allocated the dynamic port numbers. So the creation
of this early transporter cannot be used to send the dynamic ports to the mgmd.
We connect to the mgm server (using the handle that will be used in the client_Connect thread)
if needed. This is thread safe as start_service is only ever called once, before
the client connect thread starts.
connect_client,connect_ndb_mgmd may destroy the NdbMgmHandle. It now accepts a pointer to it.
ndb/src/kernel/vm/Configuration.cpp:
Copy the m_mgmd_host string from the config_retreiver as the NdbMgmHandle in the
ConfigRetreiver will be destroyed later (along with the host string).
globalTransporterRegistry.connect_client will destroy the mgm handle, use a pointer to the handle.
ndb/src/kernel/vm/Configuration.hpp:
allow the dynamic allocation of m_mgmd_host.
ndb/src/mgmapi/mgmapi.cpp:
accept a pointer for ndb_mgm_convert_to_transporter as we destroy the handle.
ndb/include/mgmapi/mgmapi.h:
Add mgmapi call: ndb_mgm_get_mgmd_nodeid()
- returns the node id that the handle is connected to.
- returns 0 on error.
ndb/include/transporter/TransporterRegistry.hpp:
Add TransporterRegistry::connect_client(NdbMgmHandle h)
- uses a connected NdbMgmHandle to connect to the mgm server as a client.
- sets up a transporter connection
- used to transform the initial mgm connection (used for fetching configuration)
into a transporter connection
Added connect_ndb_mgmd(NdbMgmHandle h)
- turn the supplied mgm connection into a transporter connection
- return the socket
Improve comments on connect_ndb_mgmd(SocketClient)
ndb/src/common/transporter/Transporter.cpp:
Add Transporter::connect_client(NDB_SOCKET_TYPE)
- use an existing socket to make a transporter connection
ndb/src/common/transporter/Transporter.hpp:
Add connect_client(NDB_SOCKET_TYPE)
ndb/src/common/transporter/TransporterRegistry.cpp:
Add TransporterRegistry::connect_client(NdbMgmHandle)
- use an existing mgm connection to connect a transporter
- used to change the mgm connection used for fetching configuration into a transporter
Add connect_ndb_mgmd(NdbMgmHandle)
- use existing NdbMgmHandle
- convert to transporter
- return socket
ndb/src/kernel/vm/Configuration.cpp:
After fetching configuration, use the mgm connection as a transporter.
Fail fatally if this fails.
ndb/src/mgmapi/mgmapi.cpp:
Add ndb_mgm_get_mgmd_nodeid(h)
- returns the node id of the mgm server you're connected to.
ndb/src/mgmsrv/Services.cpp:
Add "get mgmd nodeid" mgmd call
returns 'nodeid' - the node id of the mgm server your connected to
ndb/src/mgmsrv/Services.hpp:
add prototype for get_mgmd_nodeid
ndb/src/mgmapi/LocalConfig.cpp:
added options to give nodeid and mgmd host directly as switches (without using the connectstring)
reset nodeid on init
allow only nodeid to be specified in the connectstring
allow mgmd-host in connectstring
ndb/src/mgmapi/mgmapi.cpp:
just some extra debug printouts
ndb/include/ndbapi/NdbScanFilter.hpp:
TUP scan filter support for LIKE/NOT_LIKE
ndb/include/util/NdbSqlUtil.hpp:
TUP scan filter support for LIKE/NOT_LIKE
ndb/src/common/util/NdbSqlUtil.cpp:
TUP scan filter support for LIKE/NOT_LIKE
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
TUP scan filter support for LIKE/NOT_LIKE
ndb/src/ndbapi/NdbScanFilter.cpp:
TUP scan filter support for LIKE/NOT_LIKE
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/include/mgmapi/mgmapi.h:
merge
mysql-test/r/ndb_index_ordered.result:
fix new decimal mysql vs. ndb
mysql-test/t/ndb_index_ordered.test:
fix new decimal mysql vs. ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
fix new decimal mysql vs. ndb
ndb/include/ndb_constants.h:
fix new decimal mysql vs. ndb
ndb/include/ndbapi/NdbDictionary.hpp:
fix new decimal mysql vs. ndb
ndb/include/util/NdbSqlUtil.hpp:
fix new decimal mysql vs. ndb
ndb/src/common/util/NdbSqlUtil.cpp:
fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionary.cpp:
fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbRecAttr.cpp:
fix new decimal mysql vs. ndb
ndb/test/include/NdbSchemaOp.hpp:
fix new decimal mysql vs. ndb
ndb/test/src/HugoCalculator.cpp:
fix new decimal mysql vs. ndb
ndb/tools/restore/consumer.cpp:
fix new decimal mysql vs. ndb
sql/ha_ndbcluster.cc:
fix new decimal mysql vs. ndb
changed to set NdbMgmHandle from IPPConfig, and use info from configuration, instead of mgm handle from config retrieval
ndb/src/ndbapi/Ndb.cpp:
added som debug printout
ndb/src/ndbapi/NdbTransaction.cpp:
added some debug printout
mysql-test/r/ndb_index_ordered.result:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
mysql-test/r/ndb_index_ordered.result:
fix old decimal type mysql vs ndb (re-commit 3)
mysql-test/t/ndb_index_ordered.test:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/kernel/signaldata/DictTabInfo.hpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/ndbapi/NdbDictionary.hpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/util/NdbSqlUtil.hpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/common/util/NdbSqlUtil.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionary.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbRecAttr.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/test/include/NdbSchemaOp.hpp:
fix old decimal type mysql vs ndb (re-commit 3)
ndb/tools/restore/consumer.cpp:
fix old decimal type mysql vs ndb (re-commit 3)
sql/ha_ndbcluster.cc:
fix old decimal type mysql vs ndb (re-commit 3)
Reconnect to mgm server in connect_clients thread if m_mgm_handle is disconnected.
ndb/include/mgmapi/mgmapi.h:
Add prototype for ndb_mgm_is_connected
ndb/src/common/transporter/TransporterRegistry.cpp:
start_clients_thread:
- don't get port if we don't have to
- Reconnect to mgm server if m_mgm_handle is disconnected
ndb/src/mgmapi/mgmapi.cpp:
add ndb_mgm_is_connected
- 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
