ndb/src/mgmsrv/MgmtSrvr.cpp:
  Document why getOwnNodeID==nodeId is different in ::versionNode
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Document the usage of the address pointer returned from status()

BUG#12037 ndb_mgmd IP address do not show in other ndb_mgmd processes

Extend ApiVersionConf to include address.


ndb/include/kernel/signaldata/ApiVersion.hpp:
  Extend ApiVersionConf to include inet_addr. the address used for communication to this node.
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  include connect address in ApiVersionConf
ndb/src/mgmsrv/MgmtSrvr.cpp:
  ::status() now also returns char* address of the node.
  For API or MGM, this is in ApiVersionConf.
  For NDB, this is the standard get_connect_address.
  
  When sending ApiVersionReq, try to send to a STARTED node (as these have
  properly joined the cluster and know the connect addresses).
  
  If versionNode is called for getOwnNodeId()==nodeId, try to get the address
  via ApiVersionConf. If that fails, look it up in the configuration.
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Add char **address to prototypes.
ndb/src/mgmsrv/Services.cpp:
  Get the connect address from mgmsrv.status()

Some new code that does this job is being written against 5.1. This code is
largely removed from that work.


ndb/include/kernel/GlobalSignalNumbers.h:
  remove dead (never used) MGM_(UN)LOCK signal numbers
ndb/src/mgmsrv/Config.cpp:
  remove unused generation number code.
  
  remove unused Config::change
ndb/src/mgmsrv/Config.hpp:
  remove unused generation number prototypes.
ndb/src/mgmsrv/MgmtSrvr.cpp:
  remove unused getPrimaryNode
ndb/src/mgmsrv/MgmtSrvr.hpp:
  remove prototypes for config lock and commit/rollback.
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  remove CONFIG (UN)LOCK signals, lockConf/unlockConf, commit/rollback and changeConfig.
  
  never used.
ndb/src/mgmsrv/Services.cpp:
  remove unused configuration locking code
ndb/src/mgmsrv/Services.hpp:
  remove usused configuration locking code

into  mysql.com:/home/stewart/Documents/MySQL/4.1/mgmd

mysql-test/lib/mtr_process.pl:
  Handle errors in child processes separate from the parent process (patch supplied by Kent).
mysql-test/lib/mtr_report.pl:
  New function to handle errors in child processes separate from the parent process (patch supplied by Kent).
  Expected to avoid HUP signals.

mysql-test/lib/mtr_report.pl:
  Make the Perl test script output identical to that of the (old) shell script,
  so that reported differences compare as equal strings (for automatic analysis).

into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged

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


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

into  mysql.com:/home/jimw/my/mysql-4.1-clean

mysql-test/r/ndb_autodiscover.result:
  Update results

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1

into  selena.:H:/MYSQL/src/#05588-mysql-4.1


include/my_global.h:
  Auto merged

into  kite-hub.kitebird.com:/tmp/merge-4.1

into  kite-hub.kitebird.com:/tmp/merge-4.1


README:
  Auto merged

  Update README (2nd try)


README:
  Update README (2nd try)

into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged

into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008

into  mishka.mysql.com:/home/my/mysql-4.1

Fix for bug #13025; Server crash in filesort because wrong call to handler::position()


client/mysqltest.c:
  Code cleanup during review
mysql-test/r/innodb.result:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
mysql-test/t/innodb.test:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
sql/filesort.cc:
  Don't call handler::position() if row was not found
sql/item_cmpfunc.cc:
  Indentation changes
sql/sql_select.cc:
  Moved variable to outer level

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

into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008

into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008

into  eel.(none):/home/jonas/src/mysql-4.1-push

  produce warning for 'create database if not exists' if database exists
  do not update database options in this case  
  produce warning for 'create table if not exists' if table exists



mysql-test/r/create.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/temp_table.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/warnings.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/t/create.test:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    test case
sql/sql_db.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create database if not exists' if database exists
    do not update database options in this case
sql/sql_table.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create table if not exists' if table exists

corrected typo in ndb Parser

into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus

into  eel.(none):/home/jonas/src/mysql-4.1-push

to eliminate nondeterminism in slave start

into  eel.(none):/home/jonas/src/mysql-4.1-push

into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

into  eel.(none):/home/jonas/src/mysql-4.1-push