into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl2

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into build.mysql.com:/users/tulin/mysql-5.0-ndb

   updated naming
Makefile.am:
  updated naming


ndb/docs/Makefile.am:
  updated naming
ndb/docs/doxygen/predoxy.pl:
   updated naming

  changed some doxygen flags


ndb/docs/doxygen/Doxyfile.ndb:
  changed some doxygen flags

to make pdf do "make all-pdf"

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

    added some doxygen skip internal


ndb/include/ndbapi/Ndb.hpp:
  removed interpreted program stuff from docs
ndb/include/ndbapi/NdbOperation.hpp:
  added some doxygen skip internal

into mysql.com:/home/jonas/src/mysql-5.0-ndb

removed friend declarations from doxygen
updated some documentation in mgmapi


BitKeeper/deleted/.del-NdbCursorOperation.hpp~da121aeaf101b136:
  Delete: ndb/include/ndbapi/NdbCursorOperation.hpp
BitKeeper/deleted/.del-NdbCursorOperation.cpp~8d49480ced2deba5:
  Delete: ndb/src/ndbapi/NdbCursorOperation.cpp
ndb/include/Makefile.am:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/ScanTab.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TcCommit.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TcHbRep.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TcIndx.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TcKeyConf.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TcKeyFailConf.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TcRollbackRep.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TransIdAI.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/mgmapi/mgmapi.h:
  backwards compatible name change NdbConnectionto NdbTransaction
  documented some missing things in mgmapi
ndb/include/ndbapi/Ndb.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbApi.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbBlob.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbDictionary.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbEventOperation.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbIndexOperation.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbOperation.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbRecAttr.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbReceiver.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbScanFilter.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbScanOperation.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbTransaction.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/Makefile.am:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/Ndb.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbApiSignal.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbBlob.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbImpl.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbIndexOperation.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbOperation.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbOperationDefine.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbOperationExec.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbOperationInt.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbOperationSearch.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbReceiver.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbScanOperation.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbTransaction.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbTransactionScan.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/Ndberr.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/Ndbif.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/Ndbinit.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/Ndblist.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/tools/restore/consumer_restore.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
sql/ha_ndbcluster.h:
  backwards compatible name change NdbConnectionto NdbTransaction

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl2

In "client connect thread", let the client read the port to connect to using
ndb_mgm_get_connection_int_parameter.

The request for the port is resent on every connect attempt.


ndb/include/mgmapi/mgmapi_debug.h:
  Make ndb_mgm_get_connection_int_parameter return a Uint32 value - this is what Properties etc use, so we'll be consistent.
ndb/include/transporter/TransporterRegistry.hpp:
  Add NdbMgmHandle to constructor. This is used to get the port number
  to connect to from mgmd. Defaults to NULL, although things will go badly
  if you don't change this (by calling the new set_mgm_handle method) pretty
  quickly.
  
  Add set_mgm_handle(NdbMgmHandle) method.
   - sets the MgmHandle to use when requesting from mgmd what port to connect to a node on.
ndb/src/common/transporter/Transporter.hpp:
  Make remote port not a const.
  Add method to set remote port - set_r_port(unsigned int)
  
  Make getLocalNodeId return localNodeId, not remoteNodeId.
ndb/src/common/transporter/TransporterRegistry.cpp:
  TransporterRegistry::TransporterRegistry()
   - accept NdbMgmHandle parameter
   - set m_mgm_handle to this
  
  TransporterRegistry::start_clients_thread()
   - If we're connecting to a node, and the server_port (from the config) is <=0,
  	we request the port number to connect to from mgmd.
  
  (note: in testing, the <=0 check was commented out so the code was run.
  There is no harm in always running it, it's just an extra round-trip to mgmd
  that we may not need).
ndb/src/kernel/main.cpp:
  Set the mgm_handle for globalTransporterRegistry soon after we have set up theConfig (which sets up the mgmHandle).
ndb/src/mgmapi/mgmapi.cpp:
  - Remove dead #else on #if 1
  
  - Print an error message and warning if the parser returns NULL.
    this will no longer silently fail, it will give output with
    information to help the programmer find out where things went wrong.
    In normal operation, this codepath should never be hit.
  
  - fix handlers for 'get|set connection parameter' calls.
ndb/src/mgmsrv/MgmtSrvr.cpp:
  - Create TransporterFacade with the mgmHandle.
  - Don't worry about the order of node1 and node2 in getConnectionDbParameter
  - use a proper DBUG_RETURN in getConnectionParameter
ndb/src/mgmsrv/Services.cpp:
  - fix reply to 'get connection parameter'
  - optimise reply size.
ndb/src/ndbapi/TransporterFacade.cpp:
  - create TransporterRegistry with m_mgm_handle
  - set m_mgm_handle in constructor
ndb/src/ndbapi/TransporterFacade.hpp:
  Introduce m_mgm_handle member.
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  create TransporterFacade (with mgmHandle) after the ConfigRetriever has been created

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port

ndb/test/run-test/daily-basic-tests.txt:
  change order between tests as flexXX don't clean up tables

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

ndb/test/run-test/daily-devel-tests.txt:
  run full mysql-test-run in autotest
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/home/jonas/src/mysql-5.0-ndb

ndb/include/kernel/signaldata/CreateTable.hpp:
  Check array size in dict before creating table
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Check array size in dict before creating table
ndb/src/ndbapi/ndberror.c:
  Check array size in dict before creating table

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port

into mysql.com:/home/cps/mysql/trees/mysql-5.0

This fix icludes workaround for Irix compiler bug & removs some unused
variables (resulted in warnings)


server-tools/instance-manager/mysql_connection.cc:
  removed unused variable
server-tools/instance-manager/parse.cc:
  removed unused variable
server-tools/instance-manager/thread_registry.cc:
  Workaround for the Irix compiler bug
server-tools/instance-manager/user_map.cc:
  removed unused variable

  added compatability info
NdbTransaction.hpp:
  Rename: ndb/include/ndbapi/NdbConnection.hpp -> ndb/include/ndbapi/NdbTransaction.hpp


ndb/include/ndbapi/NdbTransaction.hpp:
  Rename: ndb/include/ndbapi/NdbConnection.hpp -> ndb/include/ndbapi/NdbTransaction.hpp
ndb/src/common/util/version.c:
  added compatability info

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

into mysql.com:/home/dlenev/src/mysql-5.0-tzbug

into hundin.mysql.fi:/home/jan/mysql-5.0

into mysql.com:/home/dlenev/src/mysql-5.0-tzbug

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b7283

into mysql.com:/home/dlenev/src/mysql-5.0-tzbug


sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged