Commit graph

1494 commits

Author SHA1 Message Date
unknown
48f05d2fce Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3
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
2005-01-12 18:41:00 +11:00
unknown
5615ff29bb Impl4 of WL2278 - Dynamic port allocation of cluster nodes
When a node restarts it starts over again with fetching the configuration
-  It is not sure that it can use the "old dynamically allocated port number" again.
-  It should however try to reuse the old one, if not possible it should
allocate a new one. One has to be able to distinguish between portnumbers
specified originally in the config, and ones that has been dynamically added
(the latter may be changed if "busy", but the first cannot be changed).

We use negative portnumbers for ports that are ok to change.


ndb/include/mgmapi/mgmapi_debug.h:
  change prototype for:
  ndb_mgm_set_connection_int_parameter
  ndb_mgm_get_connection_int_parameter
  
  Accept/set an int instead of an unsigned
ndb/include/transporter/TransporterRegistry.hpp:
  Use an int (signed) to represent a port number.
  
  Zero means dynamic (but unassigned)
  >0 means static (defined in configuration)
  <0 means dynamic (and should be converted to positive before use)
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Set up the Transporter with a port number of the correct sign.
ndb/src/common/transporter/TransporterRegistry.cpp:
  start_clients_thread:
   - handle negative port numbers
  
  add_transporter_interface:
   - accept signed integer as port number
  
  start_service:
   - If port is dynamic (<0), try to bind to it.
  	if that fails (e.g. some other process has taken that port),
  	then get a new dynamic port number.
ndb/src/mgmapi/mgmapi.cpp:
  Use a signed integer for value in:
  ndb_mgm_set_connection_int_parameter
  ndb_mgm_get_connection_int_parameter
  
  Cast to a Uint32 for storage/retrieval to/from Properties
ndb/src/mgmsrv/MgmtSrvr.cpp:
  getConnectionDbParameter
   - return value as integer (signed)
   - cast as Uint32 for iter.get
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Update prototype of getConnectionDbParameter
  
  int value (not unsigned anymore)
ndb/src/mgmsrv/Services.cpp:
  MgmApiSession::getConnectionParameter
   - value is now signed
2005-01-12 18:13:54 +11:00
unknown
61eec3db43 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
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/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
2005-01-12 11:25:49 +11:00
unknown
a964b18269 change to using public enum for log events
ndb/include/Makefile.am:
  added ndb_logevent to source dist
2005-01-11 23:25:45 +01:00
unknown
0f44ad64d0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-11 23:02:14 +01:00
unknown
9318c3d453 Documentation: NdbError is no longer a class,
it's a struct now.


ndb/include/ndbapi/Ndb.hpp:
  NdbError is no longer a class, it's a struct now.
2005-01-12 03:55:53 +10:00
unknown
533bd8fc3f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-11 18:36:35 +01:00
unknown
ccbe896a24 removed getBaseTable, was wrong and will not work 2005-01-11 18:32:02 +01:00
unknown
58034683dc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-01-11 17:20:14 +01:00
unknown
d067695909 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-01-11 13:56:06 +01:00
unknown
f2e368483d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-01-11 13:50:28 +01:00
unknown
e7b38aa7bd Fixes for two compile-time failures.
ndb/src/common/transporter/TransporterRegistry.cpp:
  make it compile with -ansi -pedantic
sql/sql_lex.cc:
  a fix for compile-time failure
2005-01-11 15:32:23 +03:00
unknown
d73a4de9b7 bug#7798 - ndb - range scan with invalid table version could cause node failure
mysql-test/r/ndb_index_ordered.result:
  Test scan with invalid table version
mysql-test/t/ndb_index_ordered.test:
  Test scan with invalid table version
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Set apiConnectstate= CS_ABORTING when receving a scan req with invalid
    table version
2005-01-11 13:30:11 +01:00
unknown
a28ebe6b6f Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-11 11:16:02 +01:00
unknown
9cc4ada8d4 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
2005-01-11 11:12:46 +01:00
unknown
eae30642cd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-11 10:34:37 +01:00
unknown
1ef48556bd Bug#7477 2005-01-11 10:34:36 +01:00
unknown
7535b07425 bug#7765 - ndb startup on 64-bit, increase stack on 64-bit
ndb/src/common/portlib/NdbThread.c:
  Use double stack for 64-bit
2005-01-11 10:02:31 +01:00
unknown
d2e6def187 Report an error if connect_client fails.
ndb/src/common/transporter/TransporterRegistry.cpp:
  Report an error if connect_client fails. This should never really happen,
  except if strange things are going on. Hit this case during development,
  probably good to report if it happens.
2005-01-11 13:33:00 +11:00
unknown
044172b0fa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
2005-01-10 16:02:37 +01:00
unknown
7767a687f9 added new methods for NdbTransaction::getNdbIndexOperation() and NdbTransaction::getNdbIndexScanOperation() as recommended
made others depricated
updated examples to use recommended
2005-01-10 16:02:36 +01:00
unknown
f755e4aece wl2240 - ndb partitioning
1) Fix startTransaction with hint
2) Ship fragment data to API to make better guess
3) Expose both primary & backup replicas 
   To (in the future) be even more clever on choosing nodes for
   transactions/operations


ndb/include/kernel/ndb_limits.h:
  Set maxsize of array with fragment data
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Send fragment data to API
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Send fragment data to API
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Send fragment data to API
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Send fragment data to API
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Use Uint16 for fragment info
  Fix uninit variable
ndb/src/ndbapi/Ndb.cpp:
  Impl. startTransaction with hint
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add interface for retreiving replica nodes given a hash-value
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Add interface for retreiving replica nodes given a hash-value
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  remove Fragment2NodeMap and put it on table instead
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  remove Fragment2NodeMap and put it on table instead
ndb/test/ndbapi/testNdbApi.cpp:
  Test some more
2005-01-10 14:40:54 +01:00
unknown
96ae27c7c2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-10 12:30:28 +01:00
unknown
4630282b51 updated docs on hints 2005-01-10 12:04:08 +01:00
unknown
7421239787 fixed testNdbApi to use new startTransaction interface 2005-01-10 11:54:03 +01:00
unknown
994fb392c1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-10 11:33:27 +01:00
unknown
22aa44a651 changed Ndb::startTransaction() interface or partition key/hint 2005-01-10 11:33:26 +01:00
unknown
99f07f83ac Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-10 01:35:18 +01:00
unknown
33465a14d1 fixed a number of doxygen warnings 2005-01-10 01:25:20 +01:00
unknown
c7341b2e92 Incorporate Jonas Orland's suggestions.
ndb/src/common/util/SocketServer.cpp:
  Check for errors from getsockname (and error display).
  
  use SOCKET_SIZE_TYPE (as discovered by configure) instead of socklen_t
2005-01-10 10:57:43 +11:00
unknown
69da579aeb Finish WL2278 Impl 3 - Dynamic port allocation of cluster nodes.
ndb/include/util/SocketClient.hpp:
  Add SocketClient::set_port(unsigned short port)
  - Sets both m_port and m_servaddr.sin_port
ndb/src/common/transporter/Transporter.hpp:
  Fix set_r_port to call m_socket_client->set_port(port) (if there's a socket client).
ndb/src/common/transporter/TransporterRegistry.cpp:
  Handle non-TCP Transporter nodes correctly
ndb/src/mgmsrv/main.cpp:
  Better document and error check connecting back to our own ndb_mgmd
2005-01-10 10:19:15 +11:00
unknown
4327c18b93 Merge
ndb/include/mgmapi/mgmapi.h:
  SCCS merged
2005-01-09 23:19:07 +01:00
unknown
d2ab825684 CommandInterpreter.cpp:
adopted to changes in mgmapi


ndb/src/mgmclient/CommandInterpreter.cpp:
  adopted to changes in mgmapi
2005-01-09 23:03:33 +01:00
unknown
9ec0095e47 updated ndb_mgm test
removed grep event and added congestion event
   more docs
    changed some naming, expecially regarding severities
    added config param for logevel for congestion


mysql-test/ndb/basic.result:
  updated ndb_mgm test
mysql-test/ndb/restart.test:
  updated ndb_mgm test
ndb/include/kernel/LogLevel.hpp:
  removed grep event and added congestion event
ndb/include/mgmapi/mgmapi.h:
  more docs
  changed some naming, expecially regarding severities
ndb/include/mgmapi/mgmapi_config_parameters.h:
  removed grep event and added congestion event
ndb/src/common/debugger/EventLogger.cpp:
  removed grep event and added congestion event
ndb/src/mgmapi/mgmapi.cpp:
  changed some naming, expecially regarding severities
ndb/src/mgmsrv/ConfigInfo.cpp:
  added config param for logevel for congestion
ndb/src/mgmsrv/Services.cpp:
  just som variable name changes
2005-01-09 23:02:06 +01:00
unknown
8fa10a2967 Documentation edits/fixes/cleanup for Alcatel docs.
ndb/include/mgmapi/mgmapi.h:
  Documentation edits and fixes.
ndb/include/ndbapi/Ndb.hpp:
  Misc. documentation cleanup.
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Documentation edits and fixes.
2005-01-10 02:39:36 +10:00
unknown
3c7b8815c3 added example of mgmapi usage
moved get_configuration to doxygen internal since the "iterators" are not documented
2005-01-09 14:31:54 +01:00
unknown
882490f218 ndb - change "ndb_mgmd --interactive" to use mgmclient interpreter
BitKeeper/deleted/.del-CommandInterpreter.cpp~fb62c05516034e7c:
  Delete: ndb/src/mgmsrv/CommandInterpreter.cpp
BitKeeper/deleted/.del-CommandInterpreter.hpp~8d8bc7e937d7b60e:
  Delete: ndb/src/mgmsrv/CommandInterpreter.hpp
ndb/src/Makefile.am:
  Change order between subdirs to build mgmclient before mgmsrv
    to enable --interactive in mgmsrv
ndb/src/mgmsrv/Makefile.am:
  Add --interactive by linking mgmclient
ndb/src/mgmsrv/main.cpp:
  Add --interactive by linking mgmclient
2005-01-09 13:53:54 +01:00
unknown
9b80f95f8f ndb -
Fix ndb_limit, handle cmpDate of length 3
Remove ucs2 test as it requires one to configure --with-extra-charsets


mysql-test/r/ndb_charset.result:
  Remove ucs2 test as it requires one to configure --with-extra-charsets
mysql-test/t/ndb_charset.test:
  Remove ucs2 test as it requires one to configure --with-extra-charsets
ndb/src/common/util/NdbSqlUtil.cpp:
  Fix ndb_limit, handle cmpDate of length 3
2005-01-09 11:00:37 +01:00
unknown
b4de620e51 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-09 10:58:37 +01:00
unknown
0290aad316 added some doxygen docs
removed unused error codes
2005-01-09 10:47:47 +01:00
unknown
0ac86b5c52 Ndb.hpp: Documentation edits to Cluster Concepts
and Ndb class description;
Doxyfiles: moved detailed class/member descriptions 
to top of generated files.


ndb/docs/doxygen/Doxyfile.ndbapi:
  Moved detailed class descriptions to top of output.
ndb/docs/doxygen/Doxyfile.ndb:
  Moved detailed class descriptions to top of output.
ndb/docs/doxygen/Doxyfile.odbc:
  Moved detailed class descriptions to top of output.
ndb/docs/doxygen/Doxyfile.test:
  Moved detailed class descriptions to top of output.
ndb/include/ndbapi/Ndb.hpp:
  Documentation edits to Cluster Concepts, 
  Ndb Class Description
2005-01-09 18:17:29 +10:00
unknown
579238abb3 More documentation edits in Ndb.hpp (Adaptive Send Algorithm)
ndb/include/ndbapi/Ndb.hpp:
  More documentation edits (Adaptive Send).
2005-01-09 14:55:06 +10:00
unknown
91a3e90baf ndb - wl-1442 merge fix 5.0 -> 5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 merge fix 5.0 -> 5.0-ndb
2005-01-09 01:14:11 +01:00
unknown
f029af067b Merge
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndb_constants.h:
  merge 5.0->5.0-ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge 5.0->5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  merge 5.0->5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  merge 5.0->5.0-ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  merge 5.0->5.0-ndb
2005-01-09 00:45:06 +01:00
unknown
3fbb1dd5ff updated some mgmapi docs 2005-01-09 00:45:05 +01:00
unknown
09a4872661 ndb - wl-1442 4.1->5.0 merge fixes
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/include/ndb_constants.h:
  wl-1442 4.1->5.0 merge fixes
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 4.1->5.0 merge fixes
2005-01-08 23:24:25 +01:00
unknown
2c12921a64 Merge
client/mysql.cc:
  Auto merged
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/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge
2005-01-08 22:34:16 +01:00
unknown
39aa7b102c ndb_constants.h:
wl-1442 comment for 4.1->5.0


ndb/include/ndb_constants.h:
  wl-1442 comment for 4.1->5.0
2005-01-08 19:37:50 +01:00
unknown
3186b340da ndb - wl-1442 fix Time ordering
mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Time.  adds new type id 25
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Time.  adds new type id 25
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Time.  adds new type id 25
sql/ha_ndbcluster.cc:
  wl-1442 fix Time.  adds new type id 25
2005-01-08 19:28:44 +01:00
unknown
6e38a4cd0d Ndb.hpp: Fixed some typos and added note
about parallelism (Guide section).


ndb/include/ndbapi/Ndb.hpp:
  Fixed some typos and added note about parallelism 
  (Guide section).
2005-01-09 03:47:47 +10:00