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


ndb/include/transporter/TransporterRegistry.hpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged

Add calls to mgmd after setting up connections.
(not fully functional yet, checkin for pull)


ndb/include/mgmcommon/ConfigRetriever.hpp:
  add get_mgmHandle() member function
ndb/include/transporter/TransporterRegistry.hpp:
  Add remoteNodeId parameter to add_transporter interface
  
  add get_transporter() and get_localNodeID()
  
  these are required for getting the right information out of TransporterRegistry to inform mgmd of what ports we use to connect to other nodes.
ndb/src/common/mgmcommon/IPCConfig.cpp:
  call add_transporter_interface with the new nodeId2 parameter
ndb/src/common/transporter/TransporterRegistry.cpp:
  Implement additional (remoteNodeId) parameter in add_transporter_interface
  
  Implement get_transporter()
ndb/src/kernel/main.cpp:
  Call ndb_mgm_set_connection_int_parameter() to tell mgmd what ports we use to connect to other nodes.
ndb/src/kernel/vm/Configuration.hpp:
  add get_config_retriever()
ndb/src/mgmapi/mgmapi.cpp:
  Add DBUG_ENTER call to ndb_mgm_set_connection_int_parameter
ndb/src/ndbapi/TransporterFacade.hpp:
  Add get_registry()
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Add call to ndb_mgm_set_connection_int_parameter to tell mgmd what ports we use to connect to other nodes.

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

ndb/src/mgmsrv/ConfigInfo.cpp:
  Handle connections without corresponding node

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

ndb/include/transporter/TransporterRegistry.hpp:
  fix protection

ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

ndb/docs/wl2077.txt:
  Add result from micro benchmark with shm-transporter
ndb/include/transporter/TransporterRegistry.hpp:
  Move pid into transporter registry
ndb/src/common/transporter/SHM_Transporter.cpp:
  Move pid into transporter registry
ndb/src/common/transporter/TransporterRegistry.cpp:
  Move pid into transporter registry
ndb/src/kernel/main.cpp:
  Move pid into transporter registry
ndb/src/ndbapi/TransporterFacade.cpp:
  Move pid into transporter registry

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

into mysql.com:/space/pekka/ndb/version/my50-cc

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


ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

      handled mixed tcp/shm transporters
+ bug#7124


ndb/src/common/transporter/SHM_Transporter.cpp:
  Add remote/own pid for signaling availability of data on shm-segment
ndb/src/common/transporter/SHM_Transporter.hpp:
  Add remote/own pid for signaling availability of data on shm-segment
ndb/src/common/transporter/TransporterRegistry.cpp:
  Add remote/own pid for signaling availability of data on shm-segment
ndb/src/kernel/main.cpp:
  Set pid to use for shm-signaling
ndb/src/mgmsrv/ConfigInfo.cpp:
  bug#7124
ndb/src/ndbapi/TransporterFacade.cpp:
  Set pid to use for shm-signaling

ndb/test/ndbapi/Makefile.am:
  foo

into mysql.com:/space/pekka/ndb/version/my50-cc

ndb/test/src/HugoTransactions.cpp:
  Fix memory leak in HugoLoad

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

Add facility to report back to ndb_mgmd what port was used for a connection.

We do not actually do the reporting back yet.


ndb/include/mgmapi/mgmapi_debug.h:
  Add prototype for ndb_mgm_set_connection_int_parameter
ndb/src/mgmapi/mgmapi.cpp:
  Add ndb_mgm_set_connection_int_parameter.
  
  Do 'set connection parameter' ndb_mgm_call
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Add MgmtSrvr::setConnectionDbParameter.
  
  Find the connection between node1 and node2,
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Add prototype for setConnectionDbParameter
ndb/src/mgmsrv/Services.cpp:
  Add 'set connection parameter' cmd and MgmApiSession::setConnectionParameter handler.
ndb/src/mgmsrv/Services.hpp:
  add setConnectionParameter prototype.

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

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

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

server-tools/instance-manager/buffer.cc:
  fix typo
server-tools/instance-manager/commands.cc:
  get rid of compiler warnings
server-tools/instance-manager/guardian.cc:
  fix compiler warning
server-tools/instance-manager/instance.cc:
  fix warnings
server-tools/instance-manager/instance_map.cc:
  fix return value
server-tools/instance-manager/instance_map.h:
  fix problem, caused autobuild failure. Looks like a gcc problem - 
  "friend class <name>" doesn't work if specified before enclosed class
  <name> (this is not present in newer gcc versions)

Added comments (from code review on pull)


mysql-test/r/heap.result:
  Fix results that may change from run to run
mysql-test/r/ps_5merge.result:
  Fix wrong result
mysql-test/t/heap.test:
  Make results predictable
sql/sql_show.cc:
  Add comments
  Fixed typo

ndb/include/kernel/AttributeDescriptor.hpp:
  wl-1732 support all charsets
ndb/include/kernel/ndb_limits.h:
  wl-1732 support all charsets
ndb/include/kernel/signaldata/TuxBound.hpp:
  wl-1732 support all charsets
ndb/include/util/NdbSqlUtil.hpp:
  wl-1732 support all charsets
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationDefine.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationSearch.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbScanOperation.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/ndberror.c:
  wl-1732 support all charsets
ndb/test/ndbapi/Makefile.am:
  wl-1732 support all charsets
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1732 support all charsets
ndb/tools/desc.cpp:
  wl-1732 support all charsets

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

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

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

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

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n

ndb/include/kernel/ndb_limits.h:
  #define for max null bits
ndb/include/kernel/signaldata/TupFrag.hpp:
  Error code for too many nullbits
ndb/include/util/Bitmask.hpp:
  Cosmetic fix
ndb/src/common/util/Bitmask.cpp:
  handle (pos % 32) == 0
  more unit tests
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Check bitmask overflow
ndb/src/ndbapi/ndberror.c:
  New error code
ndb/test/ndbapi/testBitfield.cpp:
  Update test program
ndb/test/run-test/daily-basic-tests.txt:
  Add testBitfield to autotest

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

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

operations.


innobase/include/lock0lock.h:
  Added lock_clust_rec_read_check_and_lock_alt(),
  a variant of lock_clust_rec_read_check_and_lock()
  without the parameter "offsets".
innobase/lock/lock0lock.c:
  Added lock_clust_rec_read_check_and_lock_alt(),
  a variant of lock_clust_rec_read_check_and_lock()
  without the parameter "offsets".
innobase/row/row0ins.c:
  row_ins_foreign_check_on_constraint(): Do not allocate offsets
  from stack. This reduces the stack space consumption of
  ON UPDATE CASCADE operations by 400 bytes per cascaded UPDATE
  operation.

ndb/src/common/util/Bitmask.cpp:
  Bug fixes + better unit test
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  fix
ndb/test/ndbapi/testBitfield.cpp:
  impl. create_random_table and transactions
ndb/test/src/HugoCalculator.cpp:
  Only use "var" size when var-size

mysqldump skips information_schema db
'use' now can use information_schema db
changed value of column 'Null' to 'NO' if column is not nullable


client/mysqldump.c:
  mysqldump skips information_schema db
mysql-test/r/alter_table.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/create.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ctype_collate.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ctype_recoding.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ctype_ujis.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/drop.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/func_sapdb.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/func_time.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/gis.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/information_schema.result:
  Added couple of tests
mysql-test/r/information_schema_inno.result:
  Removed coulmn 'CONTRAINT_METOD' from TABLE_CONSTRAINTS
  Added column 'POSITION_IN_UNIQUE_CONSTRAINT' to KEY_COLUMN_USAGE
mysql-test/r/innodb.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ndb_autodiscover.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/ps_1general.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/rpl000009.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/rpl_create_database.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/schema.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/select.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/show_check.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/sp.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/type_enum.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/r/type_ranges.result:
  changed value of column 'Null' to 'NO' if column is not nullable
mysql-test/t/information_schema.test:
  Added couple of tests
sql/sql_acl.cc:
  Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
sql/sql_db.cc:
  'use' now can use information_schema db
sql/sql_show.cc:
  code cleanup
  informaton_schema(IS) db now contains data about IS itself
sql/sql_yacc.yy:
  A fix(wrong behavour of 'SHOW COLUMNS, SHOW KEYS' with 'where condition')

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


client/mysqltest.c:
  Auto merged

  explicit setting of reconnect (no behaviour change)


server-tools/instance-manager/instance.cc:
  explicit setting of reconnect (no behaviour change)

into mysql.com:/home/mysql_src/mysql-5.0-clean

ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix alloc/dealloc of pseudo ROW_SIZE