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

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

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


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

  small bugfix "ERROR Message: failed"


ndb/src/mgmsrv/MgmtSrvr.cpp:
  small bugfix "ERROR Message: failed"

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

   added debug printouts
    changed mem allocation handling in event api
   split single and parallell event operation testing


ndb/src/kernel/blocks/suma/Suma.cpp:
  added info to dump state 8004
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  changed mem allocation handling in event api
ndb/test/ndbapi/test_event.cpp:
  split single and parallell event operation testing

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


sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

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


BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged

fixes in connect_client thread. g_eventLogger usage, correct condition on calling connect on Transporter


ndb/src/common/transporter/TransporterRegistry.cpp:
  Only check that we have a port number before attempting a transporter connect

- 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

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

Don't ask mgm server for port to connect transporter to if we already have one; only ask if connect fails.

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

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0

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

into mysql.com:/home/psergey/mysql-5.0-bug8218


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src

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

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


mysql-test/mysql-test-run.pl:
  Auto merged

into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src

into hundin.mysql.fi:/home/marko/k/mysql-5.0


sql/ha_innodb.cc:
  Auto merged

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


sql/ha_innodb.cc:
  Auto merged

Can't repeat information_schema test failure
Fix for lowercase_table3 only


mysql-test/r/lowercase_table3.result:
  Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
mysql-test/t/lowercase_table3.test:
  Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
sql/ha_innodb.cc:
  Fix for bug#8156:information_schema and lowercase_table3 fail on OSX

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

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

    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

  Fix a glitch reported by Guilhem: release the memory allocated for innodb_internal_... if innobase_init() fails; cleanups: in ha_innodb, you should use the InnoDB formatting style for the source code


sql/ha_innodb.cc:
  Fix a glitch reported by Guilhem: release the memory allocated for innodb_internal_... if innobase_init() fails; cleanups: in ha_innodb, you should use the InnoDB formatting style for the source code

suggested in review by Heikki.


innobase/include/data0type.h:
  Improve comment of dtype_struct.
innobase/include/data0type.ic:
  Rename innobase_get_mb_cset() to innobase_get_cset_width().
  dtype_get_fixed_size(): Add an extra integrity check for
  type->prtype, type->mbminlen and type->mbmaxlen.
sql/ha_innodb.cc:
  Rename innobase_get_mb_cset() to innobase_get_cset_width()

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

   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

into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420

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


sql/handler.h:
  Auto merged

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

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


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged

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