ndb/src/common/transporter/TransporterRegistry.cpp:
  Only try to get dynamic port number for TCP transporters.
ndb/src/mgmapi/mgmapi.cpp:
  DBUG_RETURN in ndb_mgm_set_connection_int_parameter
  
  Unique negative error codes for ndb_mgm_get_connection_int_parameter
ndb/src/mgmsrv/MgmtSrvr.cpp:
  add MgmtSrvr::set_connect_string(const char *str)
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Add:
  - prototype for set_connect_string
  - get_config_retriever
ndb/src/mgmsrv/main.cpp:
  Fake a connect string and connect back to ourselves.
  
  This enables us to use mgmapi routines to get configuration information.
  i.e. ndb_mgm_get_connection_int_parameter for getting dynamic port numbers to connect to.

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


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged

- Change configuration handling so that no default ports are given, but instead 0 is set (port to be dynamic)
- TransporterRegistry::start_service now only tries to connect when fetched port number > 0


ndb/include/util/SocketServer.hpp:
  Update prototype of setup() to take a pointer to the port (so we can return the port we bound to)
ndb/src/common/transporter/TransporterRegistry.cpp:
  Only try to connect_client when we have a valid port number (i.e. > 0)
ndb/src/common/util/SocketServer.cpp:
  ::setup(): Return the port we bound to
ndb/src/cw/cpcd/main.cpp:
  Use new SocketServer::setup() api - returns port we bound to.
ndb/src/mgmsrv/main.cpp:
  Conform to new SocketServer::setup() API (port is a pointer, returning the port we bound to)
ndb/src/mgmsrv/ConfigInfo.cpp:
  fixPortNumber:
  Don't create port numbers when none are specified, just set 0 (dynamic)
ndb/src/mgmsrv/MgmtSrvr.cpp:
  use DBUG_RETURN correctly in setConnectionDbParameter

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


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

ndb/include/ndb_types.h:
  SCCS merged

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

BitKeeper/etc/logging_ok:
  auto-union
ndb/test/tools/Makefile.am:
  Auto merged

into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0

  Fix Bug#7624


innobase/include/sync0rw.h:
  Fix Bug#7624
innobase/include/sync0sync.h:
  Fix Bug#7624

into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0

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

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


ndb/include/ndb_global.h.in:
  Auto merged
ndb/include/ndb_types.h:
  Auto merged

ndb/include/ndb_global.h.in:
  move types into ndb_global.h.in
  Check sizeof of Uint8, Uint32 & Uint64
ndb/include/ndb_types.h:
  move types into ndb_global.h.in

This fixed a bug in prepared statements when used with outher joins
Fixed a bug in SUM(DISTINCT) when used with prepared statements.
Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests


mysql-test/r/mysqldump.result:
  Safety fix if a previous test would fail
mysql-test/r/show_check.result:
  Safety fix if a previous test would fail
mysql-test/r/sp.result:
  Fix for --ps-protocol
mysql-test/r/synchronization.result:
  Safety fix if a previous test would fail
mysql-test/r/system_mysql_db.result:
  Safety fix if a previous test would fail
mysql-test/t/mysqldump.test:
  Safety fix if a previous test would fail
mysql-test/t/select.test:
  Safety fix if a previous test would fail
mysql-test/t/show_check.test:
  Safety fix if a previous test would fail
mysql-test/t/sp.test:
  fix for --ps-protocol
mysql-test/t/strict.test:
  Fix for --ps-protocol
mysql-test/t/synchronization.test:
  Safety fix if a previous test would fail
mysql-test/t/system_mysql_db.test:
  Safety fix if a previous test would fail
sql/item_sum.cc:
  Fix bug in SUM(DISTINCT...) when using with prepared statements
sql/item_sum.h:
  Fix bug in SUM(DISTINCT...) when using with prepared statements
sql/mysql_priv.h:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_base.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_insert.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_parse.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_prepare.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_select.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_union.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/sql_update.cc:
  Better handling of ensuring that setup_tables() are not called twice
sql/table.h:
  Better handling of ensuring that setup_tables() are not called twice

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


ndb/include/ndb_types.h:
  Auto merged

ndb/include/ndb_types.h:
  redo UintPtr handling

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

ndb/include/ndb_types.h:
  redo UintPtr handling using SIZEOF_CHARP
ndb/test/tools/Makefile.am:
  remove unused defines

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

    removed references to example2 (asynch api)


ndb/examples/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example1/ndbapi_example1.cpp:
  updated ndbapi examples
ndb/examples/ndbapi_example2/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example2/ndbapi_example2.cpp:
  updated ndbapi examples
ndb/examples/ndbapi_example3/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example3/ndbapi_example3.cpp:
  updated ndbapi examples
ndb/examples/ndbapi_example4/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example4/ndbapi_example4.cpp:
  updated ndbapi examples
ndb/examples/ndbapi_example5/Makefile:
  updated ndbapi examples
ndb/examples/ndbapi_example5/ndbapi_example5.cpp:
  updated ndbapi examples
ndb/include/ndbapi/Ndb.hpp:
  removed references to example2 (asynch api)
ndb/include/ndbapi/NdbRecAttr.hpp:
  removed references to example2 (asynch api)

BitKeeper/etc/logging_ok:
  auto-union

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

  fixed ndbapi_example     
ndbapi_example1.cpp:
  fixed ndbapi_example


ndb/examples/ndbapi_example1/ndbapi_example1.cpp:
  fixed ndbapi_example
ndb/examples/ndbapi_example1/Makefile:
  fixed ndbapi_example

into mysql.com:/home/my/mysql-5.0

(Old code failed for INSERT ... ON DUPLICATE with prepared statements) 
Instead, always reset table->insert_values on open.


mysql-test/t/trigger.test:
  Fix test for --ps-protocol
sql/sql_base.cc:
  Clear insert_values on open_table
sql/sql_insert.cc:
  Remove clear_insert_values()
sql/sql_parse.cc:
  Remove clear_insert_values()
sql/sql_prepare.cc:
  Remove clear_insert_values()
sql/table.cc:
  Remove clear_insert_values()
sql/table.h:
  Remove clear_insert_values()

ndb/examples/ndbapi_scan_example/ndbapi_scan.cpp:
  Updated example
ndb/include/ndbapi/NdbScanFilter.hpp:
  Fix default value

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

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


configure.in:
  Auto merged
ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged

  updated ndb version number


configure.in:
  updated ndb version number

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

BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.h:
  Auto merged

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