- don't wait an extra 400ms before retrying a transporter connect if the port is dynamic
ndb/src/common/transporter/TransporterRegistry.cpp:
Don't wait extra time before retrying
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
Make sure that the node itself is set in the m_connected_nodes when connected
ndb/src/kernel/vm/Configuration.cpp:
make sure we destroy the iterator before reusing the variable
ndb/src/mgmsrv/MgmtSrvr.cpp:
make sure that the "conections are up to date" when exiting from MgmtSrvr::transporter_connect()
ndb/src/ndbapi/ClusterMgr.cpp:
Make sure that the node itself is set in the m_connected_nodes when connected
use m_cofigMutex when configuration is accessed
use c++ iteration interface everywhere in MgmtSrvr code
use NDB_INVALID_SOCKET everywhere in Services.cpp
ndb/src/common/transporter/TransporterRegistry.cpp:
removed warning
ndb/src/mgmapi/mgmapi.cpp:
mgmapi to return connected port and interface _only_ if it is actually connected
ndb/src/mgmsrv/MgmtSrvr.cpp:
use m_cofigMutex when configuration is accessed
use c++ iteration interface everywhere
ndb/src/mgmsrv/Services.cpp:
use NDB_INVALID_SOCKET everywhere
connect_client thread will work more than just first-time.
ndb/src/common/transporter/Transporter.cpp:
m_r_port is now m_s_port a SIGNED port. <0 is dynamic
ndb/src/common/transporter/Transporter.hpp:
m_r_port is now m_s_port, a SIGNED port number (<0 is dynamic).
We give the socket client a positive port though.
ndb/src/common/transporter/TransporterRegistry.cpp:
Transporter now holds SIGNED port number (<0 dynamic)
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
- 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
ndb/test/run-test/daily-basic-tests.txt:
run mysql-test-run for max 1 hour
(normally 30 minutes)
ndb/test/run-test/daily-devel-tests.txt:
Add benchmark to devel suite
ndb/test/run-test/main.cpp:
Add bench mode. always produce report
ndb/test/run-test/run-test.hpp:
Add bench mode. always produce report
into mysql.com:/home/jonas/src/mysql-5.0-ndb
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/kernel/vm/FastScheduler.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
increased timeout as it is exceeded every now and then giving erroneous indication on error
ndb/test/run-test/daily-basic-tests.txt:
increased timeout as it is exceeded every now and then giving erroneous indication on error
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
added debug printouts
ndb/test/ndbapi/testDict.cpp:
updated FragmentType tests, removed failing "equal" on the tables since they will not be equal because fragmentation is updated from the kernel
ndb/test/run-test/16node-tests.txt:
adopted test scripts to new Fragment test name
ndb/test/run-test/basic.txt:
adopted test scripts to new Fragment test name
ndb/test/run-test/daily-basic-tests.txt:
adopted test scripts to new Fragment test name
BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
extra/my_print_defaults.c:
Auto merged
extra/perror.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
include/help_end.h:
Auto merged
include/help_start.h:
Auto merged
myisam/myisamlog.c:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/heap_hash.result:
Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
ndb/src/kernel/vm/FastScheduler.cpp:
Auto merged
netware/mysql_test_run.c:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.cc:
Auto merged
netware/BUILD/nwbootstrap:
merge: keep local
scripts/make_binary_distribution.sh:
merge: keep local
sql/ha_heap.cc:
Trivial merge
sql/ha_innodb.cc:
Auto merge (Code already existed in 5.0)
sql/item_cmpfunc.cc:
Simple merge
sql/item_func.cc:
Simple merge
sql/item_row.cc:
Simple merge
sql/item_strfunc.cc:
Simple merge
sql/item_subselect.cc:
Merge with sanjas optimzation patch, but keep old code withing ifdef as a reference until this is fixed
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
