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


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

removed some #id 0 code


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  replaced some "localhost" checks with try bind
ndb/src/mgmsrv/MgmtSrvr.cpp:
  removed some #id 0 code

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


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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


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

using tryBind instead to determine if we're "config host" is "local"


ndb/include/util/SocketServer.hpp:
  made tryBind static
ndb/src/common/util/SocketServer.cpp:
  made tryBind static
ndb/src/mgmsrv/MgmtSrvr.cpp:
  using tryBind instead to determine if we're "config host" is "local"

ndb/src/mgmsrv/MgmtSrvr.cpp:
  removed useless code
ndb/src/mgmsrv/MgmtSrvr.hpp:
  removed useless code

Removed grep introduced bogus mgm call


BitKeeper/deleted/.del-LogLevel.cpp~314a6bada2df40a8:
  Delete: ndb/src/common/debugger/LogLevel.cpp
ndb/include/debugger/EventLogger.hpp:
  Removed match functionality and put into mgmapi
ndb/include/kernel/LogLevel.hpp:
  Update LogLevel
ndb/include/mgmapi/mgmapi_config_parameters.h:
  fix parameter
ndb/src/common/debugger/EventLogger.cpp:
  Removed match functionality and put into mgmapi
ndb/src/common/debugger/Makefile.am:
  removed LogLevel.cpp
ndb/src/cw/cpcd/APIService.cpp:
  compiler warning
ndb/src/cw/cpcd/CPCD.cpp:
  compiler warning
ndb/src/cw/cpcd/CPCD.hpp:
  compiler warning
ndb/src/cw/cpcd/main.cpp:
  compiler warning
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Changed name of config parameter
ndb/src/kernel/vm/Configuration.cpp:
  Changed name of config parameter

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


ndb/src/common/portlib/NdbTCP.cpp:
  Auto merged

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

added support for setting up multiple interfaces
correct connect address for mgmt server
bug, -l flag would be interpreted as connectstring
added flag to remove all node id checks
changed automatic allocation of ports somewhat


ndb/include/mgmapi/mgmapi_config_parameters.h:
  removed different CFG_ defined for connection host names
ndb/include/transporter/TransporterRegistry.hpp:
  added support for setting up multiple interfaces
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  removed different CFG_ defined for connection host names
ndb/src/common/mgmcommon/IPCConfig.cpp:
  added support for setting up multiple interfaces
ndb/src/common/portlib/NdbTCP.cpp:
  added debug printouts
ndb/src/common/transporter/TransporterRegistry.cpp:
  added support for setting up multiple interfaces
ndb/src/common/util/SocketServer.cpp:
  added my_thread init to enable debug printouts
ndb/src/mgmclient/CommandInterpreter.cpp:
  shortened lines
ndb/src/mgmsrv/ConfigInfo.cpp:
  removed different CFG_ defined for connection host names
  changed automatic allocation of ports somewhat
ndb/src/mgmsrv/MgmtSrvr.cpp:
  correct connect address for mgmt server
ndb/src/mgmsrv/Services.cpp:
  shoretened lines
ndb/src/mgmsrv/main.cpp:
  bug, -l flag would be interpreted as connectstring
  added flag to remove all node id checks

with a fixed constant to pass on QNX:
max_data_file_length is calculated depending on max possible value of
record pointer. It's different on QNX, so the difference in results is OK.


mysql-test/t/ps.test:
  A quick fix for bug#5556: replace a column of SHOW TABLE STATUS result
  with a fixed constant to pass on QNX:
  max_data_file_length is calculated depending on max value of record
  pointer. It's different on QNX, so the result difference is intentional.

into hundin.mysql.fi:/home/marko/j/mysql-4.1


sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

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


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

Add support for getting events via mgmapi
removed all traces of stat port


BitKeeper/deleted/.del-NodeLogLevel.cpp~324045b93af7123b:
  Delete: ndb/src/mgmsrv/NodeLogLevel.cpp
BitKeeper/deleted/.del-NodeLogLevel.hpp~4f4ab0fe52fb497c:
  Delete: ndb/src/mgmsrv/NodeLogLevel.hpp
BitKeeper/deleted/.del-NodeLogLevelList.cpp~97dc9c909e3e92bf:
  Delete: ndb/src/mgmsrv/NodeLogLevelList.cpp
BitKeeper/deleted/.del-NodeLogLevelList.hpp~ef567dd850abddc7:
  Delete: ndb/src/mgmsrv/NodeLogLevelList.hpp
ndb/include/debugger/EventLogger.hpp:
  Split EventLogger into two classes
ndb/include/kernel/LogLevel.hpp:
  Add some nice to have methods + use uint8 for storage
ndb/include/kernel/signaldata/EventSubscribeReq.hpp:
  operator=
ndb/include/kernel/signaldata/SetLogLevelOrd.hpp:
  operator=
ndb/include/mgmapi/mgmapi.h:
  remove deprecated vars
ndb/src/common/debugger/EventLogger.cpp:
  Split into 2
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Remove hardcoded mgm stuff
ndb/src/mgmsrv/CommandInterpreter.cpp:
  #if 0
  some deprecated code
ndb/src/mgmsrv/Makefile.am:
  remove NodeLogLevel*
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Remove dead code
  Handle multiple event listeners in mgmapi
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Remove dead code
  Handle multiple event listeners in mgmapi
ndb/src/mgmsrv/Services.cpp:
  listen event method in mgmapi
ndb/src/mgmsrv/Services.hpp:
  listen event method in mgmapi
ndb/src/mgmsrv/main.cpp:
  remove stat port

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


sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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


sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

acinclude.m4:
  Uncommented zlib library message checking for Netware.
netware/init_db.sql:
  Applied a patch for Netware.
netware/test_db.sql:
  Applied a patch for Netware.

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

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

mysql-test/r/func_compress.result:
  clean-up. The length of compress() may depend on zlib version, etc.
mysql-test/t/func_compress.test:
  clean-up. The length of compress() may depend on zlib version, etc.

of EXPLAIN SELECT, rather than binary strings.

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge

set a printout in SocketClient only for debug


ndb/src/common/util/SocketClient.cpp:
  set a printout only for debug
scripts/mysql_install_db.sh:
  mysql_install_db should do skip-ndbcluster

  Bug #5561 No BINARY_FLAG in metadata


sql/item.cc:
  Bug #5561 No BINARY_FLAG in metadata

ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Auto merged
ndb/test/ndbapi/testBackup.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  SCCS merged

    changed to do execute(commit);restart() transaction instead of closeTransaction();start new
select_all.cpp
    moved my_init outside DBUG_OFF


ndb/test/src/HugoTransactions.cpp:
  changed to do execute(commit);restart() transaction instead of closeTransaction();start new
ndb/tools/select_all.cpp:
  moved my_init outside DBUG_OFF

into poseidon.(none):/home/tomas/mysql-4.1-ndb

    optimized for fewer timeouts
    changed for consistency in "time"
tests
    moved SR_UNDO tests to basic
    added testBackup -n BackupBank


ndb/test/ndbapi/bank/Bank.cpp:
  optimized for fewer timeouts
  changed for consistency in "time"
ndb/test/ndbapi/bank/Bank.hpp:
  optimized for fewer timeouts
  changed for consistency in "time"
ndb/test/run-test/daily-basic-tests.txt:
  moved SR_UNDO tests to basic
ndb/test/run-test/daily-devel-tests.txt:
  moved SR_UNDO tests to basic
  added testBackup -n BackupBank

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


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

into neptunus.(none):/home/magnus/mysql/mysql-4.1