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


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/Services.hpp:
  Auto merged

Implementation of "get connection parameter" mgmd call for getting from mgmd what port to use for a connection between two nodes.

(The actual use of this function is not yet implemented)


ndb/include/mgmapi/mgmapi_debug.h:
  Add ndb_mgm_get_connection_int_parameter() prototype
ndb/src/mgmapi/mgmapi.cpp:
  Add ndb_mgm_get_connection_int_parameter() implementation
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Add implementation of MgmtSrvr::getConnectionDbParameter()
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Add prototype for get_connectionDbParemeter
ndb/src/mgmsrv/Services.cpp:
  Add "get connection parameter" mgmd command (for over the wire)
  
  add getConnectionParameter handler for it
ndb/src/mgmsrv/Services.hpp:
  Add prototype for getConnectionParameter

ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/Services.hpp:
  Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
  Resolve merge conflict (change of parameter name)
ndb/src/common/transporter/TransporterRegistry.cpp:
  Resolve merge conflict (change of parameter name)

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

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


ndb/tools/restore/consumer_restore.cpp:
  Auto merged

ndb/tools/restore/consumer_restore.cpp:
  1) Fix bug when blobs and multiple databases bug#7379
  2) Fix bug #7346
ndb/tools/restore/consumer_restore.hpp:
  Moved tuple handle into callback object 
    instead of having separate array
  Declared m_transactions volatile

ndb/include/kernel/signaldata/AccScan.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/include/kernel/signaldata/ScanFrag.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/include/kernel/signaldata/ScanTab.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/include/ndbapi/NdbScanOperation.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/ndbapi/NdbScanOperation.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/tools/select_all.cpp:
  wl-1893: range scanning backwards, ndb kernel
sql/ha_ndbcluster.cc:
  wl-1893: range scanning backwards, ndb kernel

ndb/test/ndbapi/testDeadlock.cpp:
  for broken compilers
sql/ha_ndbcluster.cc:
  Use DBUG_PRINT since DBUG_FILE cannot be filtered out
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  missing DBUG_RETURN
ndb/include/kernel/signaldata/TupFrag.hpp:
  fix some error codes
ndb/include/kernel/signaldata/TuxMaint.hpp:
  fix some error codes
ndb/include/ndbapi/NdbBlob.hpp:
  fix some error codes
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  fix some error codes
ndb/src/ndbapi/ndberror.c:
  fix some error codes

Improve indenting.

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
ndb/include/Makefile.am:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/util/Makefile.am:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/Services.hpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
ndb/test/tools/Makefile.am:
  Auto merged
ndb/tools/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union
server-tools/instance-manager/Makefile.am:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union

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

ndb/include/kernel/AttributeDescriptor.hpp:
  removed unused
ndb/include/kernel/ndb_limits.h:
  removed unused
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Differentiate between nullable columns and null fields
    TUP wants sum all other want #null cols
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Differentiate between nullable columns and null fields
    TUP wants sum all other want #null cols
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Handle distribution key and collation in same subroutine
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle distribution key and collation in same subroutine
ndb/src/kernel/vm/VMSignal.hpp:
  Increase size of signal->theData to 32k
ndb/test/ndbapi/testPartitioning.cpp:
  better usage

into arthur.local:/my/mysql-5.0-clean

sql/share/errmsg.txt:
  Removed incorrect error messages; Fixed serbian messages.

mysql-test/r/greedy_optimizer.result:
  Adjusted query costs accordingly.
sql/sql_select.cc:
  Someone added this 0.001 cost factor to best_extension_by_limited_search(), but forgot to
  add it to the old version of the optimizer - find_best().

into hundin.mysql.fi:/home/jan/new/mysql-5.0

  My attempt N3


sql/share/errmsg.txt:
  My attempt N3

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

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

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

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

            


sql/sp.cc:
  A fix (Bug #6843: Wrong function name crashes MySQL if mysql.proc table is missi
  We test current_select (in case of error) in the my_message_sql().

ndb_mgm_set_int_parameter
ndb_mgm_set_int64_parameter
ndb_mgm_set_string_parameter


ndb/src/mgmapi/mgmapi.cpp:
  Don't include a ': ' at the end of an args.put() name.
  
  It is likely that the following calls don't work before this checkin:
  ndb_mgm_set_int_parameter
  ndb_mgm_set_int64_parameter
  ndb_mgm_set_string_parameter
  
  luckily nobody was actually calling these.

into mysql.com:/home/mydev/mysql-5.0-wl2126

tests/client_test.c:
  Moved variable declaration to the beginning of the block.
  (It's a C file, not C++)

into mysql.com:/home/mydev/mysql-5.0-wl2126

Group item fields are implemented as varstrings nowadays.
Made init_connect.test robust against existing t1.


mysql-test/r/init_connect.result:
  Made init_connect.test robust against existing t1.
mysql-test/t/init_connect.test:
  Made init_connect.test robust against existing t1.
sql/sql_select.cc:
  Enlarged group item key_length by a varstring length field.
  Group item fields are implemented as varstrings nowadays.

ndb/test/ndbapi/testPartitioning.cpp:
  Update test partitioning to add primary keys (distribution keys)
    incase of either 
  - only 1 primary key
  - primary keys with charsets
ndb/test/src/HugoCalculator.cpp:
  Fix so that Hugo can cope with pk's in the "end" of the table

include/my_global.h:
  Define UINT_MAX8
libmysql/libmysql.c:
  Replace defines for insteger limits with their custom MySQL versions.

Dynamic port allocation of cluster nodes:
Impl 1 is reporting the port used back to the mgmd. No actual dynamic ports.


ndb/src/common/mgmcommon/IPCConfig.cpp:
  pass correct node id to add_transporter_interface.
  
  remoteNodeId is what we want, and is what we're now passing
ndb/src/mgmapi/mgmapi.cpp:
  Don't use a ': ' at the end of args.put calls.
ndb/src/mgmsrv/Services.cpp:
  Fix indenting

sql/ha_innodb.cc:
  Added support for a CREATE TABLE...AUTO_INCREMENT = x; Note that the new
  value for auto increment field is set if the new values is creater than
  the maximum value in the column.

Add DBUG_PRINT to ndb_mgm_call when we encounter arguments (Properties) that we are going to ignore (not send to mgmd).


ndb/src/mgmapi/mgmapi.cpp:
  Add DBUG_PRINT to ndb_mgm_call when we encounter arguments (Properties)
  that we are going to ignore.
  
  Useful in debugging additions to mgmapi.

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

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.